From c9d4b47c809d1035e3bc26ad7c9a013f610bee02 Mon Sep 17 00:00:00 2001 From: taw27 Date: Mon, 19 Nov 2007 17:16:28 +0000 Subject: Fix more memory leaks git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@199 bf6ca9ba-c028-0410-8290-897cf20841d1 --- src/imagedisplay.c | 5 +++++ src/refine.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/imagedisplay.c b/src/imagedisplay.c index 8e1858e..1caaf9e 100644 --- a/src/imagedisplay.c +++ b/src/imagedisplay.c @@ -46,6 +46,10 @@ static void imagedisplay_rescale(ImageDisplay *imagedisplay, unsigned int v_w, u v_h = v_w/aspect_image; } + if ( imagedisplay->pixbuf_scaled ) { + g_object_unref(imagedisplay->pixbuf_scaled); + } + /* Create the scaled pixbuf from the 8-bit display data */ imagedisplay->pixbuf_scaled = gdk_pixbuf_scale_simple(imagedisplay->pixbuf, v_w, v_h, GDK_INTERP_BILINEAR); imagedisplay->view_width = v_w; @@ -295,6 +299,7 @@ ImageDisplay *imagedisplay_open_with_message(ImageRecord imagerecord, const char imagedisplay->flags = flags; imagedisplay->marks = NULL; imagedisplay->pixbuf = NULL; + imagedisplay->pixbuf_scaled = NULL; imagedisplay->realised = FALSE; gtk_window_set_title(GTK_WINDOW(imagedisplay->window), imagedisplay->title); diff --git a/src/refine.c b/src/refine.c index b68220b..da578b4 100644 --- a/src/refine.c +++ b/src/refine.c @@ -351,7 +351,7 @@ static int refine_sequence_sweep(ControlContext *ctx, double *fit, double *warp) /* Even-numbered images: fit */ refine_fit_image(ctx->cell, &ctx->images->images[i], ctx->cell_lattice); - displaywindow_update(ctx->dw); + //displaywindow_update(ctx->dw); } -- cgit v1.2.3