Commit bcf85df8 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

use RINT() instead of ROUND() to calculate the coordinates of the

2004-01-21  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpdrawable-transform.c: use RINT() instead of ROUND()
	to calculate the coordinates of the transformed tiles to avoid
	off-by-one errors when affine-transforming, flipping and rotating
	drawables with negative offsets.
	Fixes the off-by-one part of bug #132089.
parent d9b2478c
2004-01-21 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable-transform.c: use RINT() instead of ROUND()
to calculate the coordinates of the transformed tiles to avoid
off-by-one errors when affine-transforming, flipping and rotating
drawables with negative offsets.
Fixes the off-by-one part of bug #132089.
2004-01-21 Tor Lillqvist <tml@iki.fi>
* app/gui/themes.c (themes_list_themes_foreach): Fix undefined
......@@ -227,11 +227,11 @@ gimp_drawable_transform_tiles_affine (GimpDrawable *drawable,
gimp_matrix3_transform_point (&inv, u1, v2, &dx3, &dy3);
gimp_matrix3_transform_point (&inv, u2, v2, &dx4, &dy4);
x1 = ROUND (MIN4 (dx1, dx2, dx3, dx4));
y1 = ROUND (MIN4 (dy1, dy2, dy3, dy4));
x1 = RINT (MIN4 (dx1, dx2, dx3, dx4));
y1 = RINT (MIN4 (dy1, dy2, dy3, dy4));
x2 = ROUND (MAX4 (dx1, dx2, dx3, dx4));
y2 = ROUND (MAX4 (dy1, dy2, dy3, dy4));
x2 = RINT (MAX4 (dx1, dx2, dx3, dx4));
y2 = RINT (MAX4 (dy1, dy2, dy3, dy4));
}
/* Get the new temporary buffer for the transformed result */
......@@ -461,13 +461,13 @@ gimp_drawable_transform_tiles_flip (GimpDrawable *drawable,
switch (flip_type)
{
case GIMP_ORIENTATION_HORIZONTAL:
new_x = ROUND (-((gdouble) orig_x +
(gdouble) orig_width - axis) + axis);
new_x = RINT (-((gdouble) orig_x +
(gdouble) orig_width - axis) + axis);
break;
case GIMP_ORIENTATION_VERTICAL:
new_y = ROUND (-((gdouble) orig_y +
(gdouble) orig_height - axis) + axis);
new_y = RINT (-((gdouble) orig_y +
(gdouble) orig_height - axis) + axis);
break;
default:
......@@ -564,18 +564,18 @@ gimp_drawable_transform_rotate_point (gint x,
switch (rotate_type)
{
case GIMP_ROTATE_90:
*new_x = ROUND (center_x - (gdouble) y + center_y);
*new_y = ROUND (center_y + (gdouble) x - center_x);
*new_x = RINT (center_x - (gdouble) y + center_y);
*new_y = RINT (center_y + (gdouble) x - center_x);
break;
case GIMP_ROTATE_180:
*new_x = ROUND (center_x - ((gdouble) x - center_x));
*new_y = ROUND (center_y - ((gdouble) y - center_y));
*new_x = RINT (center_x - ((gdouble) x - center_x));
*new_y = RINT (center_y - ((gdouble) y - center_y));
break;
case GIMP_ROTATE_270:
*new_x = ROUND (center_x + (gdouble) y - center_y);
*new_y = ROUND (center_y - (gdouble) x + center_x);
*new_x = RINT (center_x + (gdouble) y - center_y);
*new_y = RINT (center_y - (gdouble) x + center_x);
break;
default:
......
......@@ -227,11 +227,11 @@ gimp_drawable_transform_tiles_affine (GimpDrawable *drawable,
gimp_matrix3_transform_point (&inv, u1, v2, &dx3, &dy3);
gimp_matrix3_transform_point (&inv, u2, v2, &dx4, &dy4);
x1 = ROUND (MIN4 (dx1, dx2, dx3, dx4));
y1 = ROUND (MIN4 (dy1, dy2, dy3, dy4));
x1 = RINT (MIN4 (dx1, dx2, dx3, dx4));
y1 = RINT (MIN4 (dy1, dy2, dy3, dy4));
x2 = ROUND (MAX4 (dx1, dx2, dx3, dx4));
y2 = ROUND (MAX4 (dy1, dy2, dy3, dy4));
x2 = RINT (MAX4 (dx1, dx2, dx3, dx4));
y2 = RINT (MAX4 (dy1, dy2, dy3, dy4));
}
/* Get the new temporary buffer for the transformed result */
......@@ -461,13 +461,13 @@ gimp_drawable_transform_tiles_flip (GimpDrawable *drawable,
switch (flip_type)
{
case GIMP_ORIENTATION_HORIZONTAL:
new_x = ROUND (-((gdouble) orig_x +
(gdouble) orig_width - axis) + axis);
new_x = RINT (-((gdouble) orig_x +
(gdouble) orig_width - axis) + axis);
break;
case GIMP_ORIENTATION_VERTICAL:
new_y = ROUND (-((gdouble) orig_y +
(gdouble) orig_height - axis) + axis);
new_y = RINT (-((gdouble) orig_y +
(gdouble) orig_height - axis) + axis);
break;
default:
......@@ -564,18 +564,18 @@ gimp_drawable_transform_rotate_point (gint x,
switch (rotate_type)
{
case GIMP_ROTATE_90:
*new_x = ROUND (center_x - (gdouble) y + center_y);
*new_y = ROUND (center_y + (gdouble) x - center_x);
*new_x = RINT (center_x - (gdouble) y + center_y);
*new_y = RINT (center_y + (gdouble) x - center_x);
break;
case GIMP_ROTATE_180:
*new_x = ROUND (center_x - ((gdouble) x - center_x));
*new_y = ROUND (center_y - ((gdouble) y - center_y));
*new_x = RINT (center_x - ((gdouble) x - center_x));
*new_y = RINT (center_y - ((gdouble) y - center_y));
break;
case GIMP_ROTATE_270:
*new_x = ROUND (center_x + (gdouble) y - center_y);
*new_y = ROUND (center_y - (gdouble) x + center_x);
*new_x = RINT (center_x + (gdouble) y - center_y);
*new_y = RINT (center_y - (gdouble) x + center_x);
break;
default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment