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

fixed incorrect optimization that caused glitches in the rounded corners 

2009-01-29  Sven Neumann  <sven@gimp.org>

	* app/core/gimpchannel-combine.c 
(gimp_channel_combine_ellipse_rect):
	fixed incorrect optimization that caused glitches in the rounded
	corners on the left side of rectangular selections.


svn path=/trunk/; revision=27968
This commit is contained in:
Sven Neumann 2009-01-29 10:02:47 +00:00 committed by Sven Neumann
parent 107f5fc587
commit d9bd97d02b
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-01-29 Sven Neumann <sven@gimp.org>
* app/core/gimpchannel-combine.c (gimp_channel_combine_ellipse_rect):
fixed incorrect optimization that caused glitches in the rounded
corners on the left side of rectangular selections.
2009-01-28 Sven Neumann <sven@gimp.org>
* app/pdb/gimpprocedure.c (gimp_procedure_execute): don't set an

36
app/core/gimpchannel-combine.c
View File

@ -393,16 +393,17 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
xj = ABS (cur_x + 0.5 - ellipse_center_x);
if (yi < b)
xdist = xj - a * sqrt (1 - yi * yi / b_sqr);
xdist = xj - a * sqrt (1 - SQR (yi) / b_sqr);
else
xdist = 100.0; /* anything large will work */
xdist = 1000.0; /* anything large will work */
if (xj < a)
ydist = yi - b * sqrt (1 - xj * xj / a_sqr);
ydist = yi - b * sqrt (1 - SQR (xj) / a_sqr);
else
ydist = 100.0; /* anything large will work */
ydist = 1000.0; /* anything large will work */
r = hypot (xdist, ydist);
if (r < 0.001)
dist = 0.;
else
@ -429,19 +430,21 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
{
x_start = cur_x;
last_val = val;
}
/* because we are symetric accross the y axis we can
* skip ahead a bit if we are inside. Do this if we
* have reached a value of 255 OR if we have passed
* the center of the leftmost ellipse.
*/
if ((val == 255 || cur_x >= x + a) && cur_x < x + w / 2)
{
last_val = val = 255;
cur_x = (ellipse_center_x +
(ellipse_center_x - cur_x) - 1 +
floor (straight_width));
}
/* because we are symetric accross the y axis we can
* skip ahead a bit if we are inside. Do this if we
* have reached a value of 255 OR if we have passed
* the center of the leftmost ellipse.
*/
if ((val == 255 || cur_x >= x + a) && cur_x < x + w / 2)
{
x_start = cur_x;
last_val = val = 255;
cur_x = (ellipse_center_x +
(ellipse_center_x - cur_x) - 1 +
floor (straight_width));
}
/* Time to change center? */
@ -449,7 +452,6 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
{
ellipse_center_x = x + a + straight_width;
}
}
gimp_channel_combine_segment (mask, op, x_start,