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

applied patch from Liam Quin as attached to bug #546159. Fixes bad data 

2008-08-04  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/value-propagate.c: applied patch from Liam 
Quin
	as attached to bug #546159. Fixes bad data access for black and
	white propagation and removes unneeded calls to sqrt().


svn path=/trunk/; revision=26362
This commit is contained in:
Sven Neumann 2008-08-04 14:27:38 +00:00 committed by Sven Neumann
parent 083c48d2d2
commit a94191e0db
2 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-08-04 Sven Neumann <sven@gimp.org>
* plug-ins/common/value-propagate.c: applied patch from Liam Quin
as attached to bug #546159. Fixes bad data access for black and
white propagation and removes unneeded calls to sqrt().
2008-08-04 Sven Neumann <sven@gimp.org>
Applied a slightly modified patch from Róman Joost as attached to

55
plug-ins/common/value-propagate.c
View File

@ -610,7 +610,7 @@ set_value (GimpImageBaseType dtype,
}
}
static int
static inline int
value_difference_check (guchar *pos1,
guchar *pos2,
gint ch)
@ -636,11 +636,23 @@ initialize_white (GimpImageBaseType dtype,
guchar *here,
void **tmp)
{
if (*tmp == NULL)
*tmp = (void *) g_new (gfloat, 1);
*(float *)*tmp = sqrt (channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
switch (dtype)
{
case GIMP_RGB_IMAGE:
case GIMP_RGBA_IMAGE:
if (*tmp == NULL)
*tmp = (void *) g_new (gfloat, 1);
**(float **)tmp = channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2];
break;
case GIMP_GRAYA_IMAGE:
case GIMP_GRAY_IMAGE:
break;
default:
break;
}
}
static void
@ -657,9 +669,9 @@ propagate_white (GimpImageBaseType dtype,
{
case GIMP_RGB_IMAGE:
case GIMP_RGBA_IMAGE:
v_here = sqrt (channel_mask[0] * here[0] * here[0]
v_here = channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
+ channel_mask[2] * here[2] * here[2];
if (*(float *)tmp < v_here && value_difference_check(orig, here, 3))
{
*(float *)tmp = v_here;
@ -683,11 +695,22 @@ initialize_black (GimpImageBaseType dtype,
guchar *here,
void **tmp)
{
if (*tmp == NULL)
*tmp = (void *) g_new (gfloat, 1);
*(float *)*tmp = sqrt (channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
switch (dtype)
{
case GIMP_RGB_IMAGE:
case GIMP_RGBA_IMAGE:
if (*tmp == NULL)
*tmp = (void *) g_new (gfloat, 1);
**(float **)tmp = (channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
break;
case GIMP_GRAYA_IMAGE:
case GIMP_GRAY_IMAGE:
break;
default:
break;
}
}
static void
@ -704,7 +727,7 @@ propagate_black (GimpImageBaseType image_type,
{
case GIMP_RGB_IMAGE:
case GIMP_RGBA_IMAGE:
v_here = sqrt (channel_mask[0] * here[0] * here[0]
v_here = (channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
if (v_here < *(float *)tmp && value_difference_check(orig, here, 3))
@ -753,7 +776,7 @@ initialize_middle (GimpImageBaseType image_type,
{
case GIMP_RGB_IMAGE:
case GIMP_RGBA_IMAGE:
data->original_value = sqrt (channel_mask[0] * here[0] * here[0]
data->original_value = (channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
break;
@ -785,7 +808,7 @@ propagate_middle (GimpImageBaseType image_type,
{
case GIMP_RGB_IMAGE:
case GIMP_RGBA_IMAGE:
v_here = sqrt (channel_mask[0] * here[0] * here[0]
v_here = (channel_mask[0] * here[0] * here[0]
+ channel_mask[1] * here[1] * here[1]
+ channel_mask[2] * here[2] * here[2]);
if ((v_here <= data->minv) && value_difference_check(orig, here, 3))