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

when resizing, don't advance the "data" pointer of regions of contiguous 

2007-10-23  Michael Natterer  <mitch@gimp.org>

	* app/base/pixel-region.c (pixel_region_resize): when resizing,
	don't advance the "data" pointer of regions of contiguous data. I
	should have made this change along with my pixel region cleanup of
	2005-09-03 which sanitized pixel regions of contiguous data.
	Fixes bug #489229.

	* libgimp/gimppixelrgn.c (gimp_pixel_rgn_resize): remove the same
	code here (the removed code was dead since this function refuses
	to be called on pixel regions without a drawable).


svn path=/trunk/; revision=23922
This commit is contained in:
Michael Natterer 2007-10-23 14:15:27 +00:00 committed by Michael Natterer
parent f50e06a43d
commit b8e862cbd7
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-10-23 Michael Natterer <mitch@gimp.org>
* app/base/pixel-region.c (pixel_region_resize): when resizing,
don't advance the "data" pointer of regions of contiguous data. I
should have made this change along with my pixel region cleanup of
2005-09-03 which sanitized pixel regions of contiguous data.
Fixes bug #489229.
* libgimp/gimppixelrgn.c (gimp_pixel_rgn_resize): remove the same
code here (the removed code was dead since this function refuses
to be called on pixel regions without a drawable).
2007-10-23 Sven Neumann <sven@gimp.org>
* app/core/gimpdrawable-combine.c: formatting.

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

@ -123,12 +123,6 @@ pixel_region_resize (PixelRegion *PR,
gint w,
gint h)
{
/* If the data is non-null, data is contiguous--need to advance */
if (PR->data != NULL)
PR->data += ((y - PR->y) * PR->rowstride +
(x - PR->x) * PR->bytes);
/* update sizes for both contiguous and tiled regions */
PR->x = x;
PR->y = y;
PR->w = w;

6
libgimp/gimppixelrgn.c
View File

@ -159,12 +159,6 @@ gimp_pixel_rgn_resize (GimpPixelRgn *pr,
g_return_if_fail (x >= 0 && x + width <= pr->drawable->width);
g_return_if_fail (y >= 0 && y + height <= pr->drawable->height);
/* If the data is non-null, data is contiguous--need to advance */
if (pr->data != NULL)
pr->data += ((y - pr->y) * pr->rowstride +
(x - pr->x) * pr->bpp);
/* update sizes for both contiguous and tiled regions */
pr->x = x;
pr->y = y;
pr->w = width;