From 6358f3a21a5023332be86adf933eb375dd67fea0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 5 Oct 2015 18:00:44 +0200 Subject: hdfsee: Remove image->data --- src/dw-hdfsee.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/dw-hdfsee.c') diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index 5362bca7..3911b7f4 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -94,8 +94,6 @@ static gint displaywindow_closed(GtkWidget *window, DisplayWindow *dw) if ( dw->image != NULL ) { free(dw->image->filename); - free(dw->image->data); - free(dw->image->flags); free(dw->image); } @@ -925,8 +923,6 @@ static gint displaywindow_newevent(DisplayWindow *dw, int new_event) if ( dw->not_ready_yet ) return 0; - float *old_data = dw->image->data; - uint16_t *old_flags = dw->image->flags; float **old_dp = dw->image->dp; int **old_bad = dw->image->bad; @@ -934,8 +930,6 @@ static gint displaywindow_newevent(DisplayWindow *dw, int new_event) dw->ev_list->events[new_event], 0); if ( fail ) { ERROR("Couldn't load image"); - dw->image->data = old_data; - dw->image->flags = old_flags; dw->image->dp = old_dp; dw->image->bad = old_bad; return 1; @@ -956,8 +950,6 @@ static gint displaywindow_newevent(DisplayWindow *dw, int new_event) free(old_dp[i]); free(old_bad[i]); } - free(old_data); - free(old_flags); free(old_dp); free(old_bad); return 0; -- cgit v1.2.3 From 2e1ce9b32fc5e483aad97d5d1a16466f07bb2914 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 5 Oct 2015 18:00:56 +0200 Subject: hdfsee: Disable TIFF/ADSC output functions Need a better solution here: fix them or delete them --- src/dw-hdfsee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dw-hdfsee.c') diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index 3911b7f4..77b58a7c 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -205,7 +205,7 @@ static int render_adsc_uint16(DisplayWindow *dw, const char *filename) fs = dfs; ss = dss; - val = image->data[fs + image->width * ss]; + val = 0.0;//image->data[fs + image->width * ss]; FIXME! if ( val < 0 ) { out = 0; } else if ( val > 65535 ) { -- cgit v1.2.3