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

app: port gimp_gegl_replace() to float

This commit is contained in:
Michael Natterer 2012-05-07 02:35:21 +02:00
parent 4b24194907
commit 87e266a94b
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/core/gimpdrawable-combine.c
View File

@ -336,7 +336,7 @@ gimp_drawable_real_replace_buffer (GimpDrawable *drawable,
drawable_buffer, GEGL_RECTANGLE (x, y, width, height), drawable_buffer, GEGL_RECTANGLE (x, y, width, height),
dest_buffer, GEGL_RECTANGLE (0, 0, width, height), dest_buffer, GEGL_RECTANGLE (0, 0, width, height),
drawable_buffer, GEGL_RECTANGLE (x, y, width, height), drawable_buffer, GEGL_RECTANGLE (x, y, width, height),
opacity * 255.999, opacity,
active_components); active_components);
g_object_unref (dest_buffer); g_object_unref (dest_buffer);
@ -347,7 +347,7 @@ gimp_drawable_real_replace_buffer (GimpDrawable *drawable,
drawable_buffer, GEGL_RECTANGLE (x, y, width, height), drawable_buffer, GEGL_RECTANGLE (x, y, width, height),
mask_buffer, mask_buffer_region, mask_buffer, mask_buffer_region,
drawable_buffer, GEGL_RECTANGLE (x, y, width, height), drawable_buffer, GEGL_RECTANGLE (x, y, width, height),
opacity * 255.999, opacity,
active_components); active_components);
} }
} }

52
app/gegl/gimp-gegl-loops.c
View File

@ -512,47 +512,45 @@ gimp_gegl_replace (GeglBuffer *top_buffer,
const GeglRectangle *mask_rect, const GeglRectangle *mask_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
guchar opacity, gdouble opacity,
const gboolean *affect) const gboolean *affect)
{ {
GeglBufferIterator *iter; GeglBufferIterator *iter;
const gint alpha = 4 - 1;
const gdouble norm_opacity = opacity * (1.0 / 65536.0);
iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0, iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0,
babl_format ("R'G'B'A u8"), babl_format ("RGBA float"),
GEGL_BUFFER_READ, GEGL_ABYSS_NONE); GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0, gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0,
babl_format ("R'G'B'A u8"), babl_format ("RGBA float"),
GEGL_BUFFER_READ, GEGL_ABYSS_NONE); GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, mask_buffer, mask_rect, 0, gegl_buffer_iterator_add (iter, mask_buffer, mask_rect, 0,
babl_format ("Y u8"), babl_format ("Y float"),
GEGL_BUFFER_READ, GEGL_ABYSS_NONE); GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
babl_format ("R'G'B'A u8"), babl_format ("RGBA float"),
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE); GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter)) while (gegl_buffer_iterator_next (iter))
{ {
const guchar *top = iter->data[0]; const gfloat *top = iter->data[0];
const guchar *bottom = iter->data[1]; const gfloat *bottom = iter->data[1];
const guchar *mask = iter->data[2]; const gfloat *mask = iter->data[2];
guchar *dest = iter->data[3]; gfloat *dest = iter->data[3];
while (iter->length--) while (iter->length--)
{ {
guint b; gint b;
gdouble mask_val = mask[0] * norm_opacity; gdouble mask_val = *mask * opacity;
/* calculate new alpha first. */ /* calculate new alpha first. */
gint s1_a = bottom[alpha]; gfloat s1_a = bottom[3];
gint s2_a = top[alpha]; gfloat s2_a = top[3];
gdouble a_val = s1_a + mask_val * (s2_a - s1_a); gdouble a_val = s1_a + mask_val * (s2_a - s1_a);
if (a_val == 0) if (a_val == 0.0)
{ {
/* In any case, write out versions of the blending /* In any case, write out versions of the blending
* function that result when combinations of s1_a, s2_a, * function that result when combinations of s1_a, s2_a,
@ -563,42 +561,44 @@ gimp_gegl_replace (GeglBuffer *top_buffer,
/* 2: s1_a AND s2_a both approach 0+, regardless of mask_val: */ /* 2: s1_a AND s2_a both approach 0+, regardless of mask_val: */
if (s1_a + s2_a == 0.0) if (s1_a + s2_a == 0.0)
{ {
for (b = 0; b < alpha; b++) for (b = 0; b < 3; b++)
{ {
gint new_val = 0.5 + (gdouble) bottom[b] + gfloat new_val;
mask_val * ((gdouble) top[b] - (gdouble) bottom[b]);
dest[b] = affect[b] ? MIN (new_val, 255) : bottom[b]; new_val = bottom[b] + mask_val * (top[b] - bottom[b]);
dest[b] = affect[b] ? MIN (new_val, 1.0) : bottom[b];
} }
} }
/* 3: mask_val AND s1_a both approach 0+, regardless of s2_a */ /* 3: mask_val AND s1_a both approach 0+, regardless of s2_a */
else if (s1_a + mask_val == 0.0) else if (s1_a + mask_val == 0.0)
{ {
for (b = 0; b < alpha; b++) for (b = 0; b < 3; b++)
dest[b] = bottom[b]; dest[b] = bottom[b];
} }
/* 4: mask_val -->1 AND s2_a -->0, regardless of s1_a */ /* 4: mask_val -->1 AND s2_a -->0, regardless of s1_a */
else if (1.0 - mask_val + s2_a == 0.0) else if (1.0 - mask_val + s2_a == 0.0)
{ {
for (b = 0; b < alpha; b++) for (b = 0; b < 3; b++)
dest[b] = affect[b] ? top[b] : bottom[b]; dest[b] = affect[b] ? top[b] : bottom[b];
} }
} }
else else
{ {
gdouble a_recip = 1.0 / a_val; gdouble a_recip = 1.0 / a_val;
/* possible optimization: fold a_recip into s1_a and s2_a */ /* possible optimization: fold a_recip into s1_a and s2_a */
for (b = 0; b < alpha; b++) for (b = 0; b < 3; b++)
{ {
gint new_val = 0.5 + a_recip * (bottom[b] * s1_a + mask_val * gfloat new_val = a_recip * (bottom[b] * s1_a + mask_val *
(top[b] * s2_a - bottom[b] * s1_a)); (top[b] * s2_a - bottom[b] * s1_a));
dest[b] = affect[b] ? MIN (new_val, 255) : bottom[b]; dest[b] = affect[b] ? MIN (new_val, 1.0) : bottom[b];
} }
} }
dest[alpha] = affect[alpha] ? a_val + 0.5 : s1_a; dest[3] = affect[3] ? a_val : s1_a;
top += 4; top += 4;
bottom += 4; bottom += 4;

2
app/gegl/gimp-gegl-loops.h
View File

@ -78,7 +78,7 @@ void gimp_gegl_replace (GeglBuffer *top_buffer,
const GeglRectangle *mask_rect, const GeglRectangle *mask_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
guchar opacity, gdouble opacity,
const gboolean *affect); const gboolean *affect);