aboutsummaryrefslogtreecommitdiff
path: root/src/dw-hdfsee.c
diff options
context:
space:
mode:
authorTakanori Nakane <nakane.t@gmail.com>2014-12-02 14:47:37 +0900
committerThomas White <taw@physics.org>2014-12-02 15:40:50 +0100
commitda62ca9ec060334616e0e99d4c927258fc4cf5b2 (patch)
treebacb063420e3c4e67cc66bb0294fe6762fbc3440 /src/dw-hdfsee.c
parent45da3ff62029e2416afb8e46e846c7ae910f0147 (diff)
Fix huge memory leak in hdfsee when re-loading events.
Probably we need image_free().
Diffstat (limited to 'src/dw-hdfsee.c')
-rw-r--r--src/dw-hdfsee.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c
index 55515f2c..f8d49989 100644
--- a/src/dw-hdfsee.c
+++ b/src/dw-hdfsee.c
@@ -1904,12 +1904,18 @@ static gint displaywindow_newevent(GtkMenuItem *item, struct newev *ne)
{
gboolean a;
int fail;
+ int i;
if ( ne->dw->not_ready_yet ) return 0;
a = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(ne->widget));
if ( !a ) return 0;
+ float *old_data = ne->dw->image->data;
+ uint16_t *old_flags = ne->dw->image->flags;
+ float **old_dp = ne->dw->image->dp;
+ int **old_bad = ne->dw->image->bad;
+
fail = hdf5_read2(ne->dw->hdfile, ne->dw->image,
ne->dw->ev_list->events[ne->new_ev], 0);
if ( fail ) {
@@ -1921,6 +1927,14 @@ static gint displaywindow_newevent(GtkMenuItem *item, struct newev *ne)
do_filters(ne->dw);
displaywindow_update(ne->dw);
+ for (i = 0; i < ne->dw->image->det->n_panels; i++) {
+ free(old_dp[i]);
+ free(old_bad[i]);
+ }
+ free(old_data);
+ free(old_flags);
+ free(old_dp);
+ free(old_bad);
return 0;
}