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

cosmetisc 

svn path=/trunk/; revision=22194
This commit is contained in:
Sven Neumann 2007-03-29 14:09:12 +00:00
parent ed93588115
commit 410d8a5546
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/core/gimpbrushgenerated.c
View File

@ -360,20 +360,18 @@ gimp_brush_generated_calc (GimpBrushGenerated *brush,
{ {
for (x = -half_width; x <= half_width; x++) for (x = -half_width; x <= half_width; x++)
{ {
gdouble tx, ty; gdouble d = 0;
gdouble angle; gdouble tx = c * x - s * y;
gdouble d = 0.0; gdouble ty = fabs (s * x + c * y);
tx = c*x - s*y;
ty = fabs (s*x + c*y);
if (spikes > 2) if (spikes > 2)
{ {
angle = atan2 (ty, tx); gdouble angle = atan2 (ty, tx);
while (angle > G_PI / spikes) while (angle > G_PI / spikes)
{ {
gdouble sx = tx, sy = ty; gdouble sx = tx;
gdouble sy = ty;
tx = cs * sx - ss * sy; tx = cs * sx - ss * sy;
ty = ss * sx + cs * sy; ty = ss * sx + cs * sy;
@ -387,7 +385,7 @@ gimp_brush_generated_calc (GimpBrushGenerated *brush,
switch (shape) switch (shape)
{ {
case GIMP_BRUSH_GENERATED_CIRCLE: case GIMP_BRUSH_GENERATED_CIRCLE:
d = sqrt (tx*tx + ty*ty); d = sqrt (SQR (tx) + SQR (ty));
break; break;
case GIMP_BRUSH_GENERATED_SQUARE: case GIMP_BRUSH_GENERATED_SQUARE:
d = MAX (fabs (tx), fabs (ty)); d = MAX (fabs (tx), fabs (ty));
@ -411,8 +409,11 @@ gimp_brush_generated_calc (GimpBrushGenerated *brush,
g_free (lookup); g_free (lookup);
if (xaxis) *xaxis = x_axis; if (xaxis)
if (yaxis) *yaxis = y_axis; *xaxis = x_axis;
if (yaxis)
*yaxis = y_axis;
return mask; return mask;
} }