mirror of https://github.com/GNOME/gimp.git
sprinkled with const qualifiers.
2007-12-18 Sven Neumann <sven@gimp.org> * app/paint-funcs/paint-funcs.c: sprinkled with const qualifiers. svn path=/trunk/; revision=24390
This commit is contained in:
Sven Neumann
Sven Neumann
parent
e080bb1f26
commit
942c8071e4
|
|
@ -1,3 +1,7 @@
|
|||
2007-12-18 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/paint-funcs/paint-funcs.c: sprinkled with const qualifiers.
|
||||
|
||||
2007-12-18 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/base/tile-manager.[ch]: renamed tile_manager_validate() to
|
||||
|
|
|
|||
|
|
@ -276,21 +276,20 @@ combine_indexed_and_indexed_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
gint b;
|
||||
gint tmp;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
const guchar *m = mask;
|
||||
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT (*m , opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guchar new_alpha = INT_MULT (*m , opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] && new_alpha > 127) ? src2[b] : src1[b];
|
||||
|
|
@ -306,10 +305,10 @@ combine_indexed_and_indexed_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = opacity;
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] && new_alpha > 127) ? src2[b] : src1[b];
|
||||
dest[b] = (affect[b] && opacity > 127) ? src2[b] : src1[b];
|
||||
|
||||
src1 += bytes;
|
||||
src2 += bytes;
|
||||
|
|
@ -324,15 +323,13 @@ combine_indexed_and_indexed_a_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint alpha = 1;
|
||||
const gint src2_bytes = 2;
|
||||
glong tmp;
|
||||
gint b;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -340,7 +337,9 @@ combine_indexed_and_indexed_a_pixels (const guchar *src1,
|
|||
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] && new_alpha > 127) ? src2[b] : src1[b];
|
||||
|
|
@ -356,7 +355,9 @@ combine_indexed_and_indexed_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guchar new_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] && new_alpha > 127) ? src2[b] : src1[b];
|
||||
|
|
@ -374,14 +375,12 @@ combine_indexed_a_and_indexed_a_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint alpha = 1;
|
||||
gint b;
|
||||
glong tmp;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -389,7 +388,9 @@ combine_indexed_a_and_indexed_a_pixels (const guchar *src1,
|
|||
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < alpha; b++)
|
||||
dest[b] = (affect[b] && new_alpha > 127) ? src2[b] : src1[b];
|
||||
|
|
@ -408,7 +409,9 @@ combine_indexed_a_and_indexed_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guchar new_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < alpha; b++)
|
||||
dest[b] = (affect[b] && new_alpha > 127) ? src2[b] : src1[b];
|
||||
|
|
@ -430,13 +433,11 @@ combine_inten_a_and_indexed_pixels (const guchar *src1,
|
|||
guchar *dest,
|
||||
const guchar *mask,
|
||||
const guchar *cmap,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint src2_bytes = 1;
|
||||
gint b;
|
||||
glong tmp;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -444,8 +445,10 @@ combine_inten_a_and_indexed_pixels (const guchar *src1,
|
|||
|
||||
while (length --)
|
||||
{
|
||||
gint index = src2[0] * 3;
|
||||
guchar new_alpha = INT_MULT3 (255, *m, opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guint index = src2[0] * 3;
|
||||
const guchar new_alpha = INT_MULT3 (255, *m, opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes-1; b++)
|
||||
dest[b] = (new_alpha > 127) ? cmap[index + b] : src1[b];
|
||||
|
|
@ -464,8 +467,10 @@ combine_inten_a_and_indexed_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
gint index = src2[0] * 3;
|
||||
guchar new_alpha = INT_MULT (255, opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guint index = src2[0] * 3;
|
||||
const guchar new_alpha = INT_MULT (255, opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes-1; b++)
|
||||
dest[b] = (new_alpha > 127) ? cmap[index + b] : src1[b];
|
||||
|
|
@ -473,8 +478,6 @@ combine_inten_a_and_indexed_pixels (const guchar *src1,
|
|||
dest[b] = (new_alpha > 127) ? OPAQUE_OPACITY : src1[b];
|
||||
/* alpha channel is opaque */
|
||||
|
||||
/* m++; /Per */
|
||||
|
||||
src1 += bytes;
|
||||
src2 += src2_bytes;
|
||||
dest += bytes;
|
||||
|
|
@ -489,14 +492,12 @@ combine_inten_a_and_indexed_a_pixels (const guchar *src1,
|
|||
guchar *dest,
|
||||
const guchar *mask,
|
||||
const guchar *cmap,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint alpha = 1;
|
||||
const gint alpha = 1;
|
||||
const gint src2_bytes = 2;
|
||||
gint b;
|
||||
glong tmp;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -504,8 +505,10 @@ combine_inten_a_and_indexed_a_pixels (const guchar *src1,
|
|||
|
||||
while (length --)
|
||||
{
|
||||
gint index = src2[0] * 3;
|
||||
guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
register gulong tmp;
|
||||
guint index = src2[0] * 3;
|
||||
const guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes-1; b++)
|
||||
dest[b] = (new_alpha > 127) ? cmap[index + b] : src1[b];
|
||||
|
|
@ -524,8 +527,10 @@ combine_inten_a_and_indexed_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
gint index = src2[0] * 3;
|
||||
guchar new_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
register gulong tmp;
|
||||
guint index = src2[0] * 3;
|
||||
const guchar new_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes-1; b++)
|
||||
dest[b] = (new_alpha > 127) ? cmap[index + b] : src1[b];
|
||||
|
|
@ -533,8 +538,6 @@ combine_inten_a_and_indexed_a_pixels (const guchar *src1,
|
|||
dest[b] = (new_alpha > 127) ? OPAQUE_OPACITY : src1[b];
|
||||
/* alpha channel is opaque */
|
||||
|
||||
/* m++; /Per */
|
||||
|
||||
src1 += bytes;
|
||||
src2 += src2_bytes;
|
||||
dest += bytes;
|
||||
|
|
@ -548,21 +551,20 @@ combine_inten_and_inten_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
gint b;
|
||||
gint tmp;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
const guchar * m = mask;
|
||||
const guchar *m = mask;
|
||||
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT (*m, opacity, tmp);
|
||||
register gulong tmp;
|
||||
const guchar new_alpha = INT_MULT (*m, opacity, tmp);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] ?
|
||||
|
|
@ -579,6 +581,8 @@ combine_inten_and_inten_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
register gulong tmp;
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] ?
|
||||
|
|
@ -597,15 +601,13 @@ combine_inten_and_inten_a_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint alpha = bytes;
|
||||
const gint src2_bytes = bytes + 1;
|
||||
gint b;
|
||||
register glong t1;
|
||||
const gint alpha = bytes;
|
||||
const gint src2_bytes = bytes + 1;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -613,7 +615,9 @@ combine_inten_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, t1);
|
||||
register glong t1;
|
||||
const guchar new_alpha = INT_MULT3 (src2[alpha], *m, opacity, t1);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] ?
|
||||
|
|
@ -631,7 +635,8 @@ combine_inten_and_inten_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT (src2[alpha],opacity,t1);
|
||||
register glong t1;
|
||||
const guchar new_alpha = INT_MULT (src2[alpha], opacity, t1);
|
||||
|
||||
dest[0] = INT_BLEND (src2[0] , src1[0] , new_alpha, t1);
|
||||
dest[1] = INT_BLEND (src2[1] , src1[1] , new_alpha, t1);
|
||||
|
|
@ -646,7 +651,9 @@ combine_inten_and_inten_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
guchar new_alpha = INT_MULT (src2[alpha],opacity,t1);
|
||||
register glong t1;
|
||||
const guchar new_alpha = INT_MULT (src2[alpha], opacity, t1);
|
||||
guint b;
|
||||
|
||||
for (b = 0; b < bytes; b++)
|
||||
dest[b] = (affect[b] ?
|
||||
|
|
@ -738,18 +745,17 @@ combine_inten_a_and_inten_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
gboolean mode_affect, /* how does the combination mode affect alpha? */
|
||||
const gboolean mode_affect, /* how does the combination mode affect alpha? */
|
||||
guint length,
|
||||
guint bytes) /* 4 or 2 depending on RGBA or GRAYA */
|
||||
const guint bytes) /* 4 or 2 depending on RGBA or GRAYA */
|
||||
{
|
||||
const gint src2_bytes = bytes - 1;
|
||||
const gint alpha = bytes - 1;
|
||||
gint b;
|
||||
gfloat ratio;
|
||||
gfloat compl_ratio;
|
||||
glong tmp;
|
||||
const gint src2_bytes = bytes - 1;
|
||||
const gint alpha = bytes - 1;
|
||||
gint b;
|
||||
gfloat ratio;
|
||||
gfloat compl_ratio;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -759,8 +765,9 @@ combine_inten_a_and_inten_pixels (const guchar *src1,
|
|||
{
|
||||
while (length--)
|
||||
{
|
||||
guchar src2_alpha = *m;
|
||||
guchar new_alpha =
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = *m;
|
||||
guchar new_alpha =
|
||||
src1[alpha] + INT_MULT ((255 - src1[alpha]), src2_alpha, tmp);
|
||||
|
||||
alphify (src2_alpha, new_alpha);
|
||||
|
|
@ -785,8 +792,9 @@ combine_inten_a_and_inten_pixels (const guchar *src1,
|
|||
{
|
||||
while (length--)
|
||||
{
|
||||
guchar src2_alpha = INT_MULT (*m, opacity, tmp);
|
||||
guchar new_alpha =
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT (*m, opacity, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] + INT_MULT ((255 - src1[alpha]), src2_alpha, tmp);
|
||||
|
||||
alphify (src2_alpha, new_alpha);
|
||||
|
|
@ -812,8 +820,9 @@ combine_inten_a_and_inten_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
guchar src2_alpha = opacity;
|
||||
guchar new_alpha =
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = opacity;
|
||||
guchar new_alpha =
|
||||
src1[alpha] + INT_MULT ((255 - src1[alpha]), src2_alpha, tmp);
|
||||
|
||||
alphify (src2_alpha, new_alpha);
|
||||
|
|
@ -821,11 +830,13 @@ combine_inten_a_and_inten_pixels (const guchar *src1,
|
|||
if (mode_affect)
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
else
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] : (affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
|
||||
src1 += bytes;
|
||||
src2 += src2_bytes;
|
||||
dest += bytes;
|
||||
src1 += bytes;
|
||||
src2 += src2_bytes;
|
||||
dest += bytes;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -836,17 +847,16 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
const guchar *src2,
|
||||
guchar *dest,
|
||||
const guchar *mask,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
const gboolean *affect,
|
||||
gboolean mode_affect, /* how does the combination mode affect alpha? */
|
||||
const gboolean mode_affect, /* how does the combination mode affect alpha? */
|
||||
guint length,
|
||||
guint bytes) /* 4 or 2 depending on RGBA or GRAYA */
|
||||
const guint bytes) /* 4 or 2 depending on RGBA or GRAYA */
|
||||
{
|
||||
const guint alpha = bytes - 1;
|
||||
guint b;
|
||||
gfloat ratio;
|
||||
gfloat compl_ratio;
|
||||
glong tmp;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
|
@ -870,6 +880,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
while (i--)
|
||||
{
|
||||
/* GUTS */
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT (src2[alpha], *m, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] +
|
||||
|
|
@ -879,12 +890,14 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = (affect[alpha] ?
|
||||
new_alpha : src1[alpha]);
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
m++;
|
||||
|
|
@ -910,6 +923,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
while (j--)
|
||||
{
|
||||
/* GUTS */
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT (src2[alpha], *m, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] +
|
||||
|
|
@ -919,12 +933,14 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = (affect[alpha] ?
|
||||
new_alpha : src1[alpha]);
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
m++;
|
||||
|
|
@ -953,6 +969,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
while (length--)
|
||||
{
|
||||
/* GUTS */
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT (src2[alpha], *m, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] + INT_MULT ((255 - src1[alpha]), src2_alpha, tmp);
|
||||
|
|
@ -961,12 +978,13 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = affect[alpha] ? new_alpha : src1[alpha];
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
m++;
|
||||
|
|
@ -993,6 +1011,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
while (i--)
|
||||
{
|
||||
/* GUTS */
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT3 (src2[alpha], *m, opacity,
|
||||
tmp);
|
||||
guchar new_alpha =
|
||||
|
|
@ -1003,12 +1022,14 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = (affect[alpha] ?
|
||||
new_alpha : src1[alpha]);
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
m++;
|
||||
|
|
@ -1034,7 +1055,9 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
while (j--)
|
||||
{
|
||||
/* GUTS */
|
||||
guchar src2_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT3 (src2[alpha],
|
||||
*m, opacity, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] +
|
||||
INT_MULT ((255 - src1[alpha]), src2_alpha, tmp);
|
||||
|
|
@ -1043,12 +1066,14 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = (affect[alpha] ?
|
||||
new_alpha : src1[alpha]);
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
m++;
|
||||
|
|
@ -1078,6 +1103,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
while (length--)
|
||||
{
|
||||
/* GUTS */
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT3 (src2[alpha], *m, opacity, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] +
|
||||
|
|
@ -1087,12 +1113,13 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = affect[alpha] ? new_alpha : src1[alpha];
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
m++;
|
||||
|
|
@ -1109,6 +1136,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = src2[alpha];
|
||||
guchar new_alpha =
|
||||
src1[alpha] +
|
||||
|
|
@ -1118,12 +1146,13 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = affect[alpha] ? new_alpha : src1[alpha];
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
src1 += bytes;
|
||||
|
|
@ -1135,6 +1164,7 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
{
|
||||
while (length --)
|
||||
{
|
||||
register gulong tmp;
|
||||
guchar src2_alpha = INT_MULT (src2[alpha], opacity, tmp);
|
||||
guchar new_alpha =
|
||||
src1[alpha] + INT_MULT ((255 - src1[alpha]), src2_alpha, tmp);
|
||||
|
|
@ -1143,12 +1173,13 @@ combine_inten_a_and_inten_a_pixels (const guchar *src1,
|
|||
|
||||
if (mode_affect)
|
||||
{
|
||||
dest[alpha] = (affect[alpha]) ? new_alpha : src1[alpha];
|
||||
dest[alpha] = affect[alpha] ? new_alpha : src1[alpha];
|
||||
}
|
||||
else
|
||||
{
|
||||
dest[alpha] = (src1[alpha]) ? src1[alpha] :
|
||||
(affect[alpha] ? new_alpha : src1[alpha]);
|
||||
dest[alpha] = (src1[alpha] ?
|
||||
src1[alpha] : (affect[alpha] ?
|
||||
new_alpha : src1[alpha]));
|
||||
}
|
||||
|
||||
src1 += bytes;
|
||||
|
|
@ -1165,23 +1196,24 @@ combine_inten_a_and_channel_mask_pixels (const guchar *src,
|
|||
const guchar *channel,
|
||||
guchar *dest,
|
||||
const guchar *col,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint alpha = bytes - 1;
|
||||
gint b;
|
||||
gint t, s;
|
||||
|
||||
while (length --)
|
||||
{
|
||||
register gulong t;
|
||||
guchar channel_alpha = INT_MULT (255 - *channel, opacity, t);
|
||||
|
||||
if (channel_alpha)
|
||||
{
|
||||
guchar compl_alpha;
|
||||
guchar new_alpha =
|
||||
register gulong s;
|
||||
const guchar new_alpha =
|
||||
src[alpha] + INT_MULT ((255 - src[alpha]), channel_alpha, t);
|
||||
guchar compl_alpha;
|
||||
guint b;
|
||||
|
||||
if (new_alpha != 255)
|
||||
channel_alpha = (channel_alpha * 255) / new_alpha;
|
||||
|
|
@ -1200,8 +1232,8 @@ combine_inten_a_and_channel_mask_pixels (const guchar *src,
|
|||
}
|
||||
|
||||
/* advance pointers */
|
||||
src+=bytes;
|
||||
dest+=bytes;
|
||||
src += bytes;
|
||||
dest += bytes;
|
||||
channel++;
|
||||
}
|
||||
}
|
||||
|
|
@ -1212,23 +1244,24 @@ combine_inten_a_and_channel_selection_pixels (const guchar *src,
|
|||
const guchar *channel,
|
||||
guchar *dest,
|
||||
const guchar *col,
|
||||
guint opacity,
|
||||
const guint opacity,
|
||||
guint length,
|
||||
guint bytes)
|
||||
const guint bytes)
|
||||
{
|
||||
const gint alpha = bytes - 1;
|
||||
gint b;
|
||||
gint t, s;
|
||||
|
||||
while (length --)
|
||||
{
|
||||
guchar channel_alpha = INT_MULT (*channel, opacity, t);
|
||||
register gulong t;
|
||||
guchar channel_alpha = INT_MULT (*channel, opacity, t);
|
||||
|
||||
if (channel_alpha)
|
||||
{
|
||||
guchar compl_alpha;
|
||||
guchar new_alpha =
|
||||
register gulong s;
|
||||
const guchar new_alpha =
|
||||
src[alpha] + INT_MULT ((255 - src[alpha]), channel_alpha, t);
|
||||
guchar compl_alpha;
|
||||
guint b;
|
||||
|
||||
if (new_alpha != 255)
|
||||
channel_alpha = (channel_alpha * 255) / new_alpha;
|
||||
|
|
@ -1242,11 +1275,13 @@ combine_inten_a_and_channel_selection_pixels (const guchar *src,
|
|||
dest[b] = new_alpha;
|
||||
}
|
||||
else
|
||||
memcpy(dest, src, bytes);
|
||||
{
|
||||
memcpy (dest, src, bytes);
|
||||
}
|
||||
|
||||
/* advance pointers */
|
||||
src+=bytes;
|
||||
dest+=bytes;
|
||||
src += bytes;
|
||||
dest += bytes;
|
||||
channel++;
|
||||
}
|
||||
}
|
||||
|
|
@ -4560,7 +4595,7 @@ combine_regions (PixelRegion *src1,
|
|||
|
||||
/* Second check - if any single colour channel can't be affected,
|
||||
we can't use the opacity quickskip.
|
||||
*/
|
||||
*/
|
||||
if (st.opacity_quickskip_possible)
|
||||
{
|
||||
for (i = 0; i < src1->bytes - 1; i++)
|
||||
|
|
|
|||
Loading…
Reference in New Issue