callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't leak the GimpDrawable.

Browse Source 
2008-09-09  Sven Neumann  <sven@gimp.org>

	* plug-ins/file-psd/psd-save.c (create_merged_image): don't leak
	the GimpDrawable.


svn path=/trunk/; revision=26905
This commit is contained in:
Sven Neumann
2008-09-09 08:01:49 +00:00
committed by Sven Neumann
parent 9d37148ae9
commit 01a9a1bce8
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-09-09 Sven Neumann <sven@gimp.org>
* plug-ins/file-psd/psd-save.c (create_merged_image): don't leak
the GimpDrawable.
2008-09-09 Martin Nordholts <martinn@svn.gnome.org>
* plug-ins/file-psd/psd-save.c (save_data): Formating.

18
plug-ins/file-psd/psd-save.c
View File

@ -1486,21 +1486,19 @@ save_data (FILE *fd,
static gint32
create_merged_image (gint32 image_id)
{
gint32 merged_layer;
gint32 projection;
merged_layer = gimp_layer_new_from_visible (image_id, image_id, SAVE_PROC);
projection = gimp_layer_new_from_visible (image_id, image_id, SAVE_PROC);
if (gimp_image_base_type (image_id) != GIMP_INDEXED)
{
GimpDrawable *drawable = gimp_drawable_get (projection);
GimpPixelRgn region;
gboolean transparency_found = FALSE;
gpointer pr;
gimp_pixel_rgn_init (&region,
gimp_drawable_get (merged_layer),
0, 0,
gimp_image_width (image_id),
gimp_image_height (image_id),
gimp_pixel_rgn_init (&region, drawable,
0, 0, drawable->width, drawable->height,
TRUE, FALSE);
for (pr = gimp_pixel_rgns_register (1, &region);
@ -1537,11 +1535,13 @@ create_merged_image (gint32 image_id)
}
}
gimp_drawable_detach (drawable);
if (! transparency_found)
gimp_layer_flatten (merged_layer);
gimp_layer_flatten (projection);
}
return merged_layer;
return projection;
}
static void