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

fixed subtle cut'n'paste bug, made the code a little bit more readable. 

2007-08-31  Simon Budig  <simon@gimp.org>

	* plug-ins/common/antialias.c: fixed subtle cut'n'paste bug,
	made the code a little bit more readable.


svn path=/trunk/; revision=23421
This commit is contained in:
Simon Budig 2007-08-31 01:13:33 +00:00 committed by Simon Budig
parent 5ad8f036d2
commit 8642b014ca
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-31 Simon Budig <simon@gimp.org>
* plug-ins/common/antialias.c: fixed subtle cut'n'paste bug,
made the code a little bit more readable.
2007-08-30 Karine Delvare <edhel@gimp.org>
* plug-ins/common/illusion.c

34
plug-ins/common/antialias.c
View File

@ -257,12 +257,16 @@ render (GimpDrawable *drawable)
memcpy (&rowafter[0], &rowafter[bytes], bytes);
memcpy (&rowafter[(width + 1) * bytes], &rowafter[width * bytes], bytes);
/* this macro returns the current pixel if it has some opacity. Otherwise
* it returns the center pixel of the current 3x3 area. */
#define USE_IF_ALPHA(p) (((!has_alpha) || *((p)+alpha)) ? (p) : &rowthis[(col+1)*bytes])
for (col = x; col < (x + w); ++col)
{
/* do 9x extrapolation pass */
if (((!has_alpha) || (rowthis[(col+1)*bytes+alpha])) &&
extrapolate9 (bytes,
&ninepix[0],
&ninepix[0*bytes],
&ninepix[1*bytes],
&ninepix[2*bytes],
&ninepix[3*bytes],
@ -271,23 +275,15 @@ render (GimpDrawable *drawable)
&ninepix[6*bytes],
&ninepix[7*bytes],
&ninepix[8*bytes],
((!has_alpha) || rowbefore[(col+0)*bytes+alpha]) ?
&rowbefore[(col+0)*bytes] : &rowthis[(col+1)*bytes],
((!has_alpha) || rowbefore[(col+1)*bytes+alpha]) ?
&rowbefore[(col+1)*bytes] : &rowthis[(col+1)*bytes],
((!has_alpha) || rowbefore[(col+2)*bytes+alpha]) ?
&rowbefore[(col+2)*bytes] : &rowthis[(col+1)*bytes],
((!has_alpha) || rowthis[(col+0)*bytes+alpha]) ?
&rowthis[(col+0)*bytes] : &rowthis[(col+1)*bytes],
&rowthis[(col+1)*bytes],
((!has_alpha) || rowthis[(col+2)*bytes+alpha]) ?
&rowthis[(col+2)*bytes] : &rowthis[(col+1)*bytes],
((!has_alpha) || rowafter[(col+0)*bytes+alpha]) ?
&rowafter[(col+0)*bytes] : &rowafter[(col+1)*bytes],
((!has_alpha) || rowafter[(col+1)*bytes+alpha]) ?
&rowafter[(col+1)*bytes] : &rowafter[(col+1)*bytes],
((!has_alpha) || rowafter[(col+2)*bytes+alpha]) ?
&rowafter[(col+2)*bytes] : &rowafter[(col+1)*bytes]
USE_IF_ALPHA (&rowbefore[(col+0)*bytes]),
USE_IF_ALPHA (&rowbefore[(col+1)*bytes]),
USE_IF_ALPHA (&rowbefore[(col+2)*bytes]),
USE_IF_ALPHA (&rowthis [(col+0)*bytes]),
&rowthis [(col+1)*bytes],
USE_IF_ALPHA (&rowthis [(col+2)*bytes]),
USE_IF_ALPHA (&rowafter [(col+0)*bytes]),
USE_IF_ALPHA (&rowafter [(col+1)*bytes]),
USE_IF_ALPHA (&rowafter [(col+2)*bytes])
))
{
/* subsample results and put into dest */
@ -306,6 +302,8 @@ render (GimpDrawable *drawable)
}
}
#undef USE_IF_ALPHA
/* write result row to dest */
gimp_pixel_rgn_set_row (&destPR, &dest[x * bytes],
x, row, w);