dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: Add pixel_regions_free()

This commit is contained in:
Martin Nordholts 2011-09-13 09:09:37 +02:00
parent 27feccc4a4
commit fea6d2e5b1
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/base/pixel-region.c
View File

@ -35,6 +35,7 @@
static gint get_portion_width (PixelRegionIterator *PRI); static gint get_portion_width (PixelRegionIterator *PRI);
static gint get_portion_height (PixelRegionIterator *PRI); static gint get_portion_height (PixelRegionIterator *PRI);
static void pixel_regions_free (PixelRegionIterator *PRI);
static PixelRegionIterator * pixel_regions_configure (PixelRegionIterator *PRI); static PixelRegionIterator * pixel_regions_configure (PixelRegionIterator *PRI);
static void pixel_region_configure (PixelRegionHolder *PRH, static void pixel_region_configure (PixelRegionHolder *PRH,
PixelRegionIterator *PRI); PixelRegionIterator *PRI);
@ -410,15 +411,7 @@ pixel_regions_process_stop (PixelRegionIterator *PRI)
} }
} }
if (PRI->pixel_regions) pixel_regions_free (PRI);
{
for (list = PRI->pixel_regions; list; list = g_slist_next (list))
g_slice_free (PixelRegionHolder, list->data);
g_slist_free (PRI->pixel_regions);
g_slice_free (PixelRegionIterator, PRI);
}
} }
@ -510,6 +503,21 @@ get_portion_width (PixelRegionIterator *PRI)
return min_width; return min_width;
} }
static void
pixel_regions_free (PixelRegionIterator *PRI)
{
if (PRI->pixel_regions)
{
GSList *list;
for (list = PRI->pixel_regions; list; list = g_slist_next (list))
g_slice_free (PixelRegionHolder, list->data);
g_slist_free (PRI->pixel_regions);
g_slice_free (PixelRegionIterator, PRI);
}
}
static PixelRegionIterator * static PixelRegionIterator *
pixel_regions_configure (PixelRegionIterator *PRI) pixel_regions_configure (PixelRegionIterator *PRI)
@ -522,15 +530,7 @@ pixel_regions_configure (PixelRegionIterator *PRI)
if (PRI->portion_width == 0 || PRI->portion_height == 0) if (PRI->portion_width == 0 || PRI->portion_height == 0)
{ {
/* free the pixel regions list */ pixel_regions_free (PRI);
if (PRI->pixel_regions)
{
for (list = PRI->pixel_regions; list; list = g_slist_next (list))
g_slice_free (PixelRegionHolder, list->data);
g_slist_free (PRI->pixel_regions);
g_slice_free (PixelRegionIterator, PRI);
}
return NULL; return NULL;
} }