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

fixed long standing roundoff error in paint_core_subsample_mask. A couple 

* paint_core.c: fixed long standing roundoff error in
	paint_core_subsample_mask.  A couple of minor code cleanups.
This commit is contained in:
jaycox 1999-07-26 07:24:47 +00:00
parent bdc744441f
commit 94446f7c5f
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jul 25 23:37:48 1999 Jay Cox (jaycox@earthlink.net)
* paint_core.c: fixed longstanding roundoff error in
paint_core_subsample_mask. A couple of minor code cleanups.
1999-07-24 Michael Natterer <mitschel@cs.tu-berlin.de> 1999-07-24 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/errorconsole.[ch]: forgot to checkin this one... * app/errorconsole.[ch]: forgot to checkin this one...

13
app/paint_core.c
View File

@ -592,11 +592,7 @@ paint_core_init (PaintCore *paint_core,
NULL); NULL);
paint_core->spacing = (double) gimp_brush_get_spacing (brush) / 100.0; paint_core->spacing = (double) gimp_brush_get_spacing (brush) / 100.0;
/* paint_core->spacing =
(double) MAXIMUM (brush->mask->width, brush->mask->height) *
((double) gimp_brush_get_spacing (brush) / 100.0);
if (paint_core->spacing < 1.0)
paint_core->spacing = 1.0; */
paint_core->brush = brush; paint_core->brush = brush;
/* free the block structures */ /* free the block structures */
@ -718,15 +714,16 @@ paint_core_interpolate (PaintCore *paint_core,
dxtilt = paint_core->curxtilt - paint_core->lastxtilt; dxtilt = paint_core->curxtilt - paint_core->lastxtilt;
dytilt = paint_core->curytilt - paint_core->lastytilt; dytilt = paint_core->curytilt - paint_core->lastytilt;
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt) if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
return; return;
/* calculate the distance traveled in the coordinate space of the brush */
mag = vector2d_magnitude (&(paint_core->brush->x_axis)); mag = vector2d_magnitude (&(paint_core->brush->x_axis));
xd = vector2d_dot_product(&delta, &(paint_core->brush->x_axis)) / (mag*mag); xd = vector2d_dot_product(&delta, &(paint_core->brush->x_axis)) / (mag*mag);
mag = vector2d_magnitude (&(paint_core->brush->y_axis)); mag = vector2d_magnitude (&(paint_core->brush->y_axis));
yd = vector2d_dot_product(&delta, &(paint_core->brush->y_axis)) / yd = vector2d_dot_product(&delta, &(paint_core->brush->y_axis)) / (mag*mag);
SQR(vector2d_magnitude(&(paint_core->brush->y_axis)));
dist = .5 * sqrt (xd*xd + yd*yd); dist = .5 * sqrt (xd*xd + yd*yd);
@ -1055,7 +1052,7 @@ paint_core_subsample_mask (MaskBuf *mask,
s = KERNEL_WIDTH; s = KERNEL_WIDTH;
while (s--) while (s--)
{ {
new_val = *d + ((*m * *k++) >> 8); new_val = *d + ((*m * *k++) /255);
*d++ = MINIMUM (new_val, 255); *d++ = MINIMUM (new_val, 255);
} }
} }

13
app/tools/paint_core.c
View File

@ -592,11 +592,7 @@ paint_core_init (PaintCore *paint_core,
NULL); NULL);
paint_core->spacing = (double) gimp_brush_get_spacing (brush) / 100.0; paint_core->spacing = (double) gimp_brush_get_spacing (brush) / 100.0;
/* paint_core->spacing =
(double) MAXIMUM (brush->mask->width, brush->mask->height) *
((double) gimp_brush_get_spacing (brush) / 100.0);
if (paint_core->spacing < 1.0)
paint_core->spacing = 1.0; */
paint_core->brush = brush; paint_core->brush = brush;
/* free the block structures */ /* free the block structures */
@ -718,15 +714,16 @@ paint_core_interpolate (PaintCore *paint_core,
dxtilt = paint_core->curxtilt - paint_core->lastxtilt; dxtilt = paint_core->curxtilt - paint_core->lastxtilt;
dytilt = paint_core->curytilt - paint_core->lastytilt; dytilt = paint_core->curytilt - paint_core->lastytilt;
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt) if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
return; return;
/* calculate the distance traveled in the coordinate space of the brush */
mag = vector2d_magnitude (&(paint_core->brush->x_axis)); mag = vector2d_magnitude (&(paint_core->brush->x_axis));
xd = vector2d_dot_product(&delta, &(paint_core->brush->x_axis)) / (mag*mag); xd = vector2d_dot_product(&delta, &(paint_core->brush->x_axis)) / (mag*mag);
mag = vector2d_magnitude (&(paint_core->brush->y_axis)); mag = vector2d_magnitude (&(paint_core->brush->y_axis));
yd = vector2d_dot_product(&delta, &(paint_core->brush->y_axis)) / yd = vector2d_dot_product(&delta, &(paint_core->brush->y_axis)) / (mag*mag);
SQR(vector2d_magnitude(&(paint_core->brush->y_axis)));
dist = .5 * sqrt (xd*xd + yd*yd); dist = .5 * sqrt (xd*xd + yd*yd);
@ -1055,7 +1052,7 @@ paint_core_subsample_mask (MaskBuf *mask,
s = KERNEL_WIDTH; s = KERNEL_WIDTH;
while (s--) while (s--)
{ {
new_val = *d + ((*m * *k++) >> 8); new_val = *d + ((*m * *k++) /255);
*d++ = MINIMUM (new_val, 255); *d++ = MINIMUM (new_val, 255);
} }
} }