[gimp] app: remove "gboolean use_offsets" from gimpdisplayshell-transform.[ch]
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: remove "gboolean use_offsets" from gimpdisplayshell-transform.[ch]
- Date: Thu, 23 Sep 2010 17:28:56 +0000 (UTC)
commit ddc63de6d6fb4ebfa7db58f6b3d4e913ebab597e
Author: Michael Natterer <mitch gimp org>
Date: Thu Sep 23 10:50:39 2010 +0200
app: remove "gboolean use_offsets" from gimpdisplayshell-transform.[ch]
app/display/gimpcanvashandle.c | 3 +-
app/display/gimpcanvasline.c | 6 +-
app/display/gimpcanvaspolygon.c | 3 +-
app/display/gimpcanvasrectangle.c | 6 +-
app/display/gimpdisplay.c | 4 +-
app/display/gimpdisplayshell-cursor.c | 2 +-
app/display/gimpdisplayshell-draw.c | 34 +++-----
app/display/gimpdisplayshell-expose.c | 10 +--
app/display/gimpdisplayshell-preview.c | 3 +-
app/display/gimpdisplayshell-scale.c | 3 +-
app/display/gimpdisplayshell-selection.c | 2 +-
app/display/gimpdisplayshell-transform.c | 141 +++++-------------------------
app/display/gimpdisplayshell-transform.h | 21 ++---
app/display/gimpdisplayshell.c | 7 +-
app/display/gimpimagewindow.c | 3 +-
app/tools/gimpcolortool.c | 3 +-
app/tools/gimpdrawtool.c | 70 ++++++---------
app/tools/gimpmovetool.c | 3 +-
app/tools/gimpregionselecttool.c | 2 +-
app/tools/gimptransformtool.c | 20 ++---
20 files changed, 100 insertions(+), 246 deletions(-)
---
diff --git a/app/display/gimpcanvashandle.c b/app/display/gimpcanvashandle.c
index 1177e70..4854235 100644
--- a/app/display/gimpcanvashandle.c
+++ b/app/display/gimpcanvashandle.c
@@ -282,8 +282,7 @@ gimp_canvas_handle_transform (GimpCanvasItem *item,
gimp_display_shell_transform_xy_f (shell,
private->x, private->y,
- x, y,
- FALSE);
+ x, y);
switch (private->type)
{
diff --git a/app/display/gimpcanvasline.c b/app/display/gimpcanvasline.c
index f29a6aa..e64fd46 100644
--- a/app/display/gimpcanvasline.c
+++ b/app/display/gimpcanvasline.c
@@ -195,12 +195,10 @@ gimp_canvas_line_transform (GimpCanvasItem *item,
gimp_display_shell_transform_xy_f (shell,
private->x1, private->y1,
- x1, y1,
- FALSE);
+ x1, y1);
gimp_display_shell_transform_xy_f (shell,
private->x2, private->y2,
- x2, y2,
- FALSE);
+ x2, y2);
*x1 = PROJ_ROUND (*x1) + 0.5;
*y1 = PROJ_ROUND (*y1) + 0.5;
diff --git a/app/display/gimpcanvaspolygon.c b/app/display/gimpcanvaspolygon.c
index 78a0d3c..c4f2059 100644
--- a/app/display/gimpcanvaspolygon.c
+++ b/app/display/gimpcanvaspolygon.c
@@ -185,8 +185,7 @@ gimp_canvas_polygon_transform (GimpCanvasItem *item,
private->points[i].x,
private->points[i].y,
&points[i].x,
- &points[i].y,
- FALSE);
+ &points[i].y);
points[i].x = PROJ_ROUND (points[i].x) + 0.5;
points[i].y = PROJ_ROUND (points[i].y) + 0.5;
diff --git a/app/display/gimpcanvasrectangle.c b/app/display/gimpcanvasrectangle.c
index c943590..d5df555 100644
--- a/app/display/gimpcanvasrectangle.c
+++ b/app/display/gimpcanvasrectangle.c
@@ -212,15 +212,13 @@ gimp_canvas_rectangle_transform (GimpCanvasItem *item,
private->x + private->width),
MIN (private->y,
private->y + private->height),
- x, y,
- FALSE);
+ x, y);
gimp_display_shell_transform_xy_f (shell,
MAX (private->x,
private->x + private->width),
MAX (private->y,
private->y + private->height),
- w, h,
- FALSE);
+ w, h);
*w -= *x;
*h -= *y;
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 4fe12dd..711dcbe 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -845,8 +845,8 @@ gimp_display_paint_area (GimpDisplay *display,
h = (y2 - y1);
/* display the area */
- gimp_display_shell_transform_xy_f (shell, x, y, &x1_f, &y1_f, FALSE);
- gimp_display_shell_transform_xy_f (shell, x + w, y + h, &x2_f, &y2_f, FALSE);
+ gimp_display_shell_transform_xy_f (shell, x, y, &x1_f, &y1_f);
+ gimp_display_shell_transform_xy_f (shell, x + w, y + h, &x2_f, &y2_f);
/* make sure to expose a superset of the transformed sub-pixel expose
* area, not a subset. bug #126942. --mitch
diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c
index e2edb75..30544a7 100644
--- a/app/display/gimpdisplayshell-cursor.c
+++ b/app/display/gimpdisplayshell-cursor.c
@@ -188,7 +188,7 @@ gimp_display_shell_update_cursor (GimpDisplayShell *shell,
/* ...but use the unsnapped display_coords for the info window */
if (display_x >= 0 && display_y >= 0)
gimp_display_shell_untransform_xy (shell, display_x, display_y,
- &t_x, &t_y, FALSE, FALSE);
+ &t_x, &t_y, FALSE);
gimp_cursor_view_update_cursor (GIMP_CURSOR_VIEW (cursor_view),
image, shell->unit,
diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c
index 9926178..5c67580 100644
--- a/app/display/gimpdisplayshell-draw.c
+++ b/app/display/gimpdisplayshell-draw.c
@@ -158,7 +158,7 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell,
switch (gimp_guide_get_orientation (guide))
{
case GIMP_ORIENTATION_HORIZONTAL:
- gimp_display_shell_transform_xy (shell, 0, position, &x, &y, FALSE);
+ gimp_display_shell_transform_xy (shell, 0, position, &x, &y);
if (y >= y1 && y < y2)
{
cairo_move_to (cr, x1, y + 0.5);
@@ -167,7 +167,7 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell,
break;
case GIMP_ORIENTATION_VERTICAL:
- gimp_display_shell_transform_xy (shell, position, 0, &x, &y, FALSE);
+ gimp_display_shell_transform_xy (shell, position, 0, &x, &y);
if (x >= x1 && x < x2)
{
cairo_move_to (cr, x + 0.5, y1);
@@ -265,8 +265,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
continue;
gimp_display_shell_transform_xy (shell,
- x, 0, &x_real, &y_real,
- FALSE);
+ x, 0, &x_real, &y_real);
if (x_real < x1 || x_real >= x2)
continue;
@@ -277,8 +276,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
continue;
gimp_display_shell_transform_xy (shell,
- x, y, &x_real, &y_real,
- FALSE);
+ x, y, &x_real, &y_real);
if (y_real >= y1 && y_real < y2)
{
@@ -296,8 +294,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
continue;
gimp_display_shell_transform_xy (shell,
- x, 0, &x_real, &y_real,
- FALSE);
+ x, 0, &x_real, &y_real);
if (x_real + CROSSHAIR < x1 || x_real - CROSSHAIR >= x2)
continue;
@@ -308,8 +305,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
continue;
gimp_display_shell_transform_xy (shell,
- x, y, &x_real, &y_real,
- FALSE);
+ x, y, &x_real, &y_real);
if (y_real + CROSSHAIR < y1 || y_real - CROSSHAIR >= y2)
continue;
@@ -345,11 +341,9 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
case GIMP_GRID_DOUBLE_DASH:
case GIMP_GRID_SOLID:
gimp_display_shell_transform_xy (shell,
- 0, 0, &x0, &y0,
- FALSE);
+ 0, 0, &x0, &y0);
gimp_display_shell_transform_xy (shell,
- width, height, &x3, &y3,
- FALSE);
+ width, height, &x3, &y3);
for (x = x_offset; x < width; x += grid->xspacing)
{
@@ -357,8 +351,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
continue;
gimp_display_shell_transform_xy (shell,
- x, 0, &x_real, &y_real,
- FALSE);
+ x, 0, &x_real, &y_real);
if (x_real >= x1 && x_real < x2)
{
@@ -373,8 +366,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
continue;
gimp_display_shell_transform_xy (shell,
- 0, y, &x_real, &y_real,
- FALSE);
+ 0, y, &x_real, &y_real);
if (y_real >= y1 && y_real < y2)
{
@@ -414,7 +406,7 @@ gimp_display_shell_draw_pen (GimpDisplayShell *shell,
gimp_display_shell_transform_xy (shell,
points[0].x, points[0].y,
- &x, &y, FALSE);
+ &x, &y);
cairo_move_to (cr, x, y);
@@ -422,7 +414,7 @@ gimp_display_shell_draw_pen (GimpDisplayShell *shell,
{
gimp_display_shell_transform_xy (shell,
points[i].x, points[i].y,
- &x, &y, FALSE);
+ &x, &y);
cairo_line_to (cr, x, y);
}
@@ -465,7 +457,7 @@ gimp_display_shell_draw_sample_point (GimpDisplayShell *shell,
gimp_display_shell_transform_xy_f (shell,
sample_point->x + 0.5,
sample_point->y + 0.5,
- &x, &y, FALSE);
+ &x, &y);
sx1 = floor (x - GIMP_SAMPLE_POINT_DRAW_SIZE);
sx2 = ceil (x + GIMP_SAMPLE_POINT_DRAW_SIZE);
diff --git a/app/display/gimpdisplayshell-expose.c b/app/display/gimpdisplayshell-expose.c
index c0a5f8f..c59805a 100644
--- a/app/display/gimpdisplayshell-expose.c
+++ b/app/display/gimpdisplayshell-expose.c
@@ -83,8 +83,7 @@ gimp_display_shell_expose_guide (GimpDisplayShell *shell,
gimp_display_shell_transform_xy (shell,
position, position,
- &x, &y,
- FALSE);
+ &x, &y);
switch (gimp_guide_get_orientation (guide))
{
@@ -117,8 +116,7 @@ gimp_display_shell_expose_sample_point (GimpDisplayShell *shell,
gimp_display_shell_transform_xy_f (shell,
sample_point->x + 0.5,
sample_point->y + 0.5,
- &x, &y,
- FALSE);
+ &x, &y);
x1 = MAX (0, floor (x - GIMP_SAMPLE_POINT_DRAW_SIZE));
y1 = MAX (0, floor (y - GIMP_SAMPLE_POINT_DRAW_SIZE));
@@ -141,8 +139,8 @@ gimp_display_shell_expose_vectors (GimpDisplayShell *shell,
if (gimp_vectors_bounds (vectors, &x1, &y1, &x2, &y2))
{
- gimp_display_shell_transform_xy_f (shell, x1, y1, &x1, &y1, FALSE);
- gimp_display_shell_transform_xy_f (shell, x2, y2, &x2, &y2, FALSE);
+ gimp_display_shell_transform_xy_f (shell, x1, y1, &x1, &y1);
+ gimp_display_shell_transform_xy_f (shell, x2, y2, &x2, &y2);
gimp_display_shell_expose_region (shell, x1, y1, x2, y2, 2);
}
diff --git a/app/display/gimpdisplayshell-preview.c b/app/display/gimpdisplayshell-preview.c
index c59579f..2ef0e7d 100644
--- a/app/display/gimpdisplayshell-preview.c
+++ b/app/display/gimpdisplayshell-preview.c
@@ -250,8 +250,7 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell,
\
gimp_display_shell_transform_xy_f (shell, \
tx1, ty1, \
- &tx2, &ty2, \
- FALSE); \
+ &tx2, &ty2); \
x[sub][index] = (gint) tx2; \
y[sub][index] = (gint) ty2; \
\
diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c
index d8d5976..63b0dd6 100644
--- a/app/display/gimpdisplayshell-scale.c
+++ b/app/display/gimpdisplayshell-scale.c
@@ -893,8 +893,7 @@ gimp_display_shell_scale_to (GimpDisplayShell *shell,
viewport_x,
viewport_y,
&image_focus_x,
- &image_focus_y,
- FALSE);
+ &image_focus_y);
gimp_display_shell_calculate_scale_x_and_y (shell, scale, &scale_x, &scale_y);
diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c
index b5b2312..8e54ed3 100644
--- a/app/display/gimpdisplayshell-selection.c
+++ b/app/display/gimpdisplayshell-selection.c
@@ -408,7 +408,7 @@ selection_transform_segs (Selection *selection,
gint i;
gimp_display_shell_transform_segments (selection->shell,
- src_segs, dest_segs, n_segs, FALSE);
+ src_segs, dest_segs, n_segs);
for (i = 0; i < n_segs; i++)
{
diff --git a/app/display/gimpdisplayshell-transform.c b/app/display/gimpdisplayshell-transform.c
index 88befda..f0e6f45 100644
--- a/app/display/gimpdisplayshell-transform.c
+++ b/app/display/gimpdisplayshell-transform.c
@@ -96,7 +96,6 @@ gimp_display_shell_untransform_coordinate (const GimpDisplayShell *shell,
* @y:
* @nx:
* @ny:
- * @use_offsets:
*
* Transforms an image coordinate to a shell coordinate.
**/
@@ -105,11 +104,8 @@ gimp_display_shell_transform_xy (const GimpDisplayShell *shell,
gdouble x,
gdouble y,
gint *nx,
- gint *ny,
- gboolean use_offsets)
+ gint *ny)
{
- gint offset_x = 0;
- gint offset_y = 0;
gint64 tx;
gint64 ty;
@@ -117,17 +113,6 @@ gimp_display_shell_transform_xy (const GimpDisplayShell *shell,
g_return_if_fail (nx != NULL);
g_return_if_fail (ny != NULL);
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
-
- x += offset_x;
- y += offset_y;
- }
-
tx = ((gint64) x * shell->x_src_dec) / shell->x_dest_inc;
ty = ((gint64) y * shell->y_src_dec) / shell->y_dest_inc;
@@ -149,8 +134,6 @@ gimp_display_shell_transform_xy (const GimpDisplayShell *shell,
* @ny: returns y coordinate in image coordinates
* @round: if %TRUE, round the results to the nearest integer;
* if %FALSE, simply cast them to @gint.
- * @use_offsets: if %TRUE, @nx and @ny will be returned in the coordinate
- * system of the active drawable instead of the image
*
* Transform from display coordinates to image coordinates, so that
* points on the display can be mapped to the corresponding points
@@ -162,11 +145,8 @@ gimp_display_shell_untransform_xy (const GimpDisplayShell *shell,
gint y,
gint *nx,
gint *ny,
- gboolean round,
- gboolean use_offsets)
+ gboolean round)
{
- gint offset_x = 0;
- gint offset_y = 0;
gint64 tx;
gint64 ty;
@@ -174,14 +154,6 @@ gimp_display_shell_untransform_xy (const GimpDisplayShell *shell,
g_return_if_fail (nx != NULL);
g_return_if_fail (ny != NULL);
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
- }
-
tx = (gint64) x + shell->offset_x;
ty = (gint64) y + shell->offset_y;
@@ -194,8 +166,8 @@ gimp_display_shell_untransform_xy (const GimpDisplayShell *shell,
tx /= shell->x_src_dec;
ty /= shell->y_src_dec;
- *nx = CLAMP (tx - offset_x, G_MININT, G_MAXINT);
- *ny = CLAMP (ty - offset_y, G_MININT, G_MAXINT);
+ *nx = CLAMP (tx, G_MININT, G_MAXINT);
+ *ny = CLAMP (ty, G_MININT, G_MAXINT);
}
/**
@@ -205,8 +177,6 @@ gimp_display_shell_untransform_xy (const GimpDisplayShell *shell,
* @y: y coordinate of point in image coordinate
* @nx: returns the transformed x coordinate
* @ny: returns the transformed y coordinate
- * @use_offsets: if %TRUE, the @x and @y coordinates are in the coordinate
- * system of the active drawable instead of the image
*
* This function is identical to gimp_display_shell_transfrom_xy(),
* except that it returns its results as doubles rather than ints.
@@ -216,26 +186,14 @@ gimp_display_shell_transform_xy_f (const GimpDisplayShell *shell,
gdouble x,
gdouble y,
gdouble *nx,
- gdouble *ny,
- gboolean use_offsets)
+ gdouble *ny)
{
- gint offset_x = 0;
- gint offset_y = 0;
-
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (nx != NULL);
g_return_if_fail (ny != NULL);
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
- }
-
- *nx = SCALEX (shell, x + offset_x) - shell->offset_x;
- *ny = SCALEY (shell, y + offset_y) - shell->offset_y;
+ *nx = SCALEX (shell, x) - shell->offset_x;
+ *ny = SCALEY (shell, y) - shell->offset_y;
}
/**
@@ -245,8 +203,6 @@ gimp_display_shell_transform_xy_f (const GimpDisplayShell *shell,
* @y: y coordinate in display coordinates
* @nx: place to return x coordinate in image coordinates
* @ny: place to return y coordinate in image coordinates
- * @use_offsets: if %TRUE, @nx and @ny will be returned in the coordinate
- * system of the active drawable instead of the image
*
* This function is identical to gimp_display_shell_untransform_xy(),
* except that the input and output coordinates are doubles rather than
@@ -257,26 +213,14 @@ gimp_display_shell_untransform_xy_f (const GimpDisplayShell *shell,
gdouble x,
gdouble y,
gdouble *nx,
- gdouble *ny,
- gboolean use_offsets)
+ gdouble *ny)
{
- gint offset_x = 0;
- gint offset_y = 0;
-
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (nx != NULL);
g_return_if_fail (ny != NULL);
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
- }
-
- *nx = (x + shell->offset_x) / shell->scale_x - offset_x;
- *ny = (y + shell->offset_y) / shell->scale_y - offset_y;
+ *nx = (x + shell->offset_x) / shell->scale_x;
+ *ny = (y + shell->offset_y) / shell->scale_y;
}
/**
@@ -285,8 +229,6 @@ gimp_display_shell_untransform_xy_f (const GimpDisplayShell *shell,
* @points: array of GimpVectors2 coordinate pairs
* @coords: returns the corresponding display coordinates
* @n_points: number of points
- * @use_offsets: if %TRUE, the source coordinates are in the coordinate
- * system of the active drawable instead of the image
*
* Transforms from image coordinates to display coordinates, so that
* objects can be rendered at the correct points on the display.
@@ -295,27 +237,16 @@ void
gimp_display_shell_transform_points (const GimpDisplayShell *shell,
const GimpVector2 *points,
GdkPoint *coords,
- gint n_points,
- gboolean use_offsets)
+ gint n_points)
{
- gint offset_x = 0;
- gint offset_y = 0;
gint i;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
- }
-
for (i = 0; i < n_points ; i++)
{
- gdouble x = points[i].x + offset_x;
- gdouble y = points[i].y + offset_y;
+ gdouble x = points[i].x;
+ gdouble y = points[i].y;
x = x * shell->x_src_dec / shell->x_dest_inc;
y = y * shell->y_src_dec / shell->y_dest_inc;
@@ -333,8 +264,6 @@ gimp_display_shell_transform_points (const GimpDisplayShell *shell,
* @image_coords: array of image coordinates
* @disp_coords: returns the corresponding display coordinates
* @n_coords: number of coordinates
- * @use_offsets: if %TRUE, the source coordinates are in the coordinate
- * system of the active drawable instead of the image
*
* Transforms from image coordinates to display coordinates, so that
* objects can be rendered at the correct points on the display.
@@ -343,27 +272,16 @@ void
gimp_display_shell_transform_coords (const GimpDisplayShell *shell,
const GimpCoords *image_coords,
GdkPoint *disp_coords,
- gint n_coords,
- gboolean use_offsets)
+ gint n_coords)
{
- gint offset_x = 0;
- gint offset_y = 0;
gint i;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item =GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
- }
-
for (i = 0; i < n_coords ; i++)
{
- gdouble x = image_coords[i].x + offset_x;
- gdouble y = image_coords[i].y + offset_y;
+ gdouble x = image_coords[i].x;
+ gdouble y = image_coords[i].y;
x = x * shell->x_src_dec / shell->x_dest_inc;
y = y * shell->y_src_dec / shell->y_dest_inc;
@@ -381,8 +299,6 @@ gimp_display_shell_transform_coords (const GimpDisplayShell *shell,
* @src_segs: array of segments in image coordinates
* @dest_segs: returns the corresponding segments in display coordinates
* @n_segs: number of segments
- * @use_offsets: if %TRUE, the source coordinates are in the coordinate
- * system of the active drawable instead of the image
*
* Transforms from image coordinates to display coordinates, so that
* objects can be rendered at the correct points on the display.
@@ -391,32 +307,21 @@ void
gimp_display_shell_transform_segments (const GimpDisplayShell *shell,
const BoundSeg *src_segs,
GdkSegment *dest_segs,
- gint n_segs,
- gboolean use_offsets)
+ gint n_segs)
{
- gint offset_x = 0;
- gint offset_y = 0;
gint i;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
- if (use_offsets)
- {
- GimpImage *image = gimp_display_get_image (shell->display);
- GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
-
- gimp_item_get_offset (item, &offset_x, &offset_y);
- }
-
for (i = 0; i < n_segs ; i++)
{
gint64 x1, x2;
gint64 y1, y2;
- x1 = src_segs[i].x1 + offset_x;
- x2 = src_segs[i].x2 + offset_x;
- y1 = src_segs[i].y1 + offset_y;
- y2 = src_segs[i].y2 + offset_y;
+ x1 = src_segs[i].x1;
+ x2 = src_segs[i].x2;
+ y1 = src_segs[i].y1;
+ y2 = src_segs[i].y2;
x1 = (x1 * shell->x_src_dec) / shell->x_dest_inc;
x2 = (x2 * shell->x_src_dec) / shell->x_dest_inc;
@@ -456,11 +361,11 @@ gimp_display_shell_untransform_viewport (const GimpDisplayShell *shell,
gimp_display_shell_untransform_xy (shell,
0, 0,
&x1, &y1,
- FALSE, FALSE);
+ FALSE);
gimp_display_shell_untransform_xy (shell,
shell->disp_width, shell->disp_height,
&x2, &y2,
- FALSE, FALSE);
+ FALSE);
image = gimp_display_get_image (shell->display);
diff --git a/app/display/gimpdisplayshell-transform.h b/app/display/gimpdisplayshell-transform.h
index a7c9f45..296b0a2 100644
--- a/app/display/gimpdisplayshell-transform.h
+++ b/app/display/gimpdisplayshell-transform.h
@@ -30,44 +30,37 @@ void gimp_display_shell_transform_xy (const GimpDisplayShell *shell,
gdouble x,
gdouble y,
gint *nx,
- gint *ny,
- gboolean use_offsets);
+ gint *ny);
void gimp_display_shell_untransform_xy (const GimpDisplayShell *shell,
gint x,
gint y,
gint *nx,
gint *ny,
- gboolean round,
- gboolean use_offsets);
+ gboolean round);
void gimp_display_shell_transform_xy_f (const GimpDisplayShell *shell,
gdouble x,
gdouble y,
gdouble *nx,
- gdouble *ny,
- gboolean use_offsets);
+ gdouble *ny);
void gimp_display_shell_untransform_xy_f (const GimpDisplayShell *shell,
gdouble x,
gdouble y,
gdouble *nx,
- gdouble *ny,
- gboolean use_offsets);
+ gdouble *ny);
void gimp_display_shell_transform_points (const GimpDisplayShell *shell,
const GimpVector2 *points,
GdkPoint *coords,
- gint n_points,
- gboolean use_offsets);
+ gint n_points);
void gimp_display_shell_transform_coords (const GimpDisplayShell *shell,
const GimpCoords *image_coords,
GdkPoint *disp_coords,
- gint n_coords,
- gboolean use_offsets);
+ gint n_coords);
void gimp_display_shell_transform_segments (const GimpDisplayShell *shell,
const BoundSeg *src_segs,
GdkSegment *dest_segs,
- gint n_segs,
- gboolean use_offsets);
+ gint n_segs);
void gimp_display_shell_untransform_viewport (const GimpDisplayShell *shell,
gint *x,
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 5b3c469..95049a4 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -1093,8 +1093,7 @@ gimp_display_shell_transform_overlay (GimpDisplayShell *shell,
gimp_display_shell_transform_xy_f (shell,
overlay->image_x,
overlay->image_y,
- x, y,
- FALSE);
+ x, y);
gtk_widget_size_request (child, &requisition);
@@ -1625,8 +1624,8 @@ gimp_display_shell_mask_bounds (GimpDisplayShell *shell,
return FALSE;
}
- gimp_display_shell_transform_xy (shell, *x1, *y1, x1, y1, FALSE);
- gimp_display_shell_transform_xy (shell, *x2, *y2, x2, y2, FALSE);
+ gimp_display_shell_transform_xy (shell, *x1, *y1, x1, y1);
+ gimp_display_shell_transform_xy (shell, *x2, *y2, x2, y2);
/* Make sure the extents are within bounds */
*x1 = CLAMP (*x1, 0, shell->disp_width);
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 1282613..90c07e1 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -1102,8 +1102,7 @@ gimp_image_window_keep_canvas_pos (GimpImageWindow *window)
gimp_display_shell_transform_xy (shell,
0.0, 0.0,
- &image_origin_shell_x, &image_origin_shell_y,
- FALSE /*use_offsets*/);
+ &image_origin_shell_x, &image_origin_shell_y);
gtk_widget_translate_coordinates (GTK_WIDGET (shell->canvas),
GTK_WIDGET (window),
image_origin_shell_x, image_origin_shell_y,
diff --git a/app/tools/gimpcolortool.c b/app/tools/gimpcolortool.c
index f462c77..9af728e 100644
--- a/app/tools/gimpcolortool.c
+++ b/app/tools/gimpcolortool.c
@@ -398,8 +398,7 @@ gimp_color_tool_motion (GimpTool *tool,
gimp_display_shell_transform_xy (shell,
coords->x, coords->y,
- &tx, &ty,
- FALSE);
+ &tx, &ty);
if (tx < 0 || tx > shell->disp_width ||
ty < 0 || ty > shell->disp_height)
diff --git a/app/tools/gimpdrawtool.c b/app/tools/gimpdrawtool.c
index 7d204fe..0c1fb23 100644
--- a/app/tools/gimpdrawtool.c
+++ b/app/tools/gimpdrawtool.c
@@ -402,8 +402,8 @@ gimp_draw_tool_calc_distance_square (GimpDrawTool *draw_tool,
shell = gimp_display_get_shell (display);
- gimp_display_shell_transform_xy_f (shell, x1, y1, &tx1, &ty1, FALSE);
- gimp_display_shell_transform_xy_f (shell, x2, y2, &tx2, &ty2, FALSE);
+ gimp_display_shell_transform_xy_f (shell, x1, y1, &tx1, &ty1);
+ gimp_display_shell_transform_xy_f (shell, x2, y2, &tx2, &ty2);
return SQR (tx2 - tx1) + SQR (ty2 - ty1);
}
@@ -476,12 +476,10 @@ gimp_draw_tool_draw_line (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
x1, y1,
- &tx1, &ty1,
- FALSE);
+ &tx1, &ty1);
gimp_display_shell_transform_xy_f (shell,
x2, y2,
- &tx2, &ty2,
- FALSE);
+ &tx2, &ty2);
gimp_canvas_draw_line (GIMP_CANVAS (shell->canvas), GIMP_CANVAS_STYLE_XOR,
PROJ_ROUND (tx1), PROJ_ROUND (ty1),
@@ -517,12 +515,10 @@ gimp_draw_tool_draw_dashed_line (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
x1, y1,
- &tx1, &ty1,
- FALSE);
+ &tx1, &ty1);
gimp_display_shell_transform_xy_f (shell,
x2, y2,
- &tx2, &ty2,
- FALSE);
+ &tx2, &ty2);
gimp_canvas_draw_line (GIMP_CANVAS (shell->canvas),
GIMP_CANVAS_STYLE_XOR_DASHED,
@@ -559,12 +555,12 @@ gimp_draw_tool_draw_guide_line (GimpDrawTool *draw_tool,
switch (orientation)
{
case GIMP_ORIENTATION_HORIZONTAL:
- gimp_display_shell_transform_xy (shell, 0, position, &x, &y, FALSE);
+ gimp_display_shell_transform_xy (shell, 0, position, &x, &y);
y1 = y2 = y;
break;
case GIMP_ORIENTATION_VERTICAL:
- gimp_display_shell_transform_xy (shell, position, 0, &x, &y, FALSE);
+ gimp_display_shell_transform_xy (shell, position, 0, &x, &y);
x1 = x2 = x;
break;
@@ -618,12 +614,10 @@ gimp_draw_tool_draw_rectangle (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
MIN (x, x + width), MIN (y, y + height),
- &tx1, &ty1,
- FALSE);
+ &tx1, &ty1);
gimp_display_shell_transform_xy_f (shell,
MAX (x, x + width), MAX (y, y + height),
- &tx2, &ty2,
- FALSE);
+ &tx2, &ty2);
tx1 = CLAMP (tx1, -1, shell->disp_width + 1);
ty1 = CLAMP (ty1, -1, shell->disp_height + 1);
@@ -672,12 +666,10 @@ gimp_draw_tool_draw_arc (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
MIN (x, x + width), MIN (y, y + height),
- &tx1, &ty1,
- FALSE);
+ &tx1, &ty1);
gimp_display_shell_transform_xy_f (shell,
MAX (x, x + width), MAX (y, y + height),
- &tx2, &ty2,
- FALSE);
+ &tx2, &ty2);
tx2 -= tx1;
ty2 -= ty1;
@@ -729,8 +721,7 @@ gimp_draw_tool_draw_rectangle_by_anchor (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
x, y,
- &tx, &ty,
- FALSE);
+ &tx, &ty);
gimp_draw_tool_shift_to_north_west (tx, ty,
width, height,
@@ -770,8 +761,7 @@ gimp_draw_tool_draw_arc_by_anchor (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
x, y,
- &tx, &ty,
- FALSE);
+ &tx, &ty);
gimp_draw_tool_shift_to_north_west (tx, ty,
width, height,
@@ -804,8 +794,7 @@ gimp_draw_tool_draw_cross_by_anchor (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
x, y,
- &tx, &ty,
- FALSE);
+ &tx, &ty);
gimp_draw_tool_shift_to_center (tx, ty,
width, height,
@@ -942,8 +931,8 @@ gimp_draw_tool_draw_corner (GimpDrawTool *draw_tool,
shell = gimp_display_get_shell (draw_tool->display);
canvas = GIMP_CANVAS (shell->canvas);
- gimp_display_shell_transform_xy (shell, x1, y1, &tx1, &ty1, FALSE);
- gimp_display_shell_transform_xy (shell, x2, y2, &tx2, &ty2, FALSE);
+ gimp_display_shell_transform_xy (shell, x1, y1, &tx1, &ty1);
+ gimp_display_shell_transform_xy (shell, x2, y2, &tx2, &ty2);
tw = tx2 - tx1;
th = ty2 - ty1;
@@ -1361,7 +1350,7 @@ gimp_draw_tool_draw_lines (GimpDrawTool *draw_tool,
coords = g_new (GdkPoint, n_points);
gimp_display_shell_transform_points (shell,
- points, coords, n_points, FALSE);
+ points, coords, n_points);
if (filled)
{
@@ -1409,7 +1398,7 @@ gimp_draw_tool_draw_strokes (GimpDrawTool *draw_tool,
coords = g_new (GdkPoint, n_points);
gimp_display_shell_transform_coords (shell,
- points, coords, n_points, FALSE);
+ points, coords, n_points);
if (filled)
{
@@ -1489,8 +1478,7 @@ gimp_draw_tool_draw_boundary (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
bound_segs[i].x1 + offset_x,
bound_segs[i].y1 + offset_y,
- &x, &y,
- FALSE);
+ &x, &y);
gdk_points[0].x = PROJ_ROUND (CLAMP (x, -1, xmax));
gdk_points[0].y = PROJ_ROUND (CLAMP (y, -1, ymax));
@@ -1521,8 +1509,7 @@ gimp_draw_tool_draw_boundary (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
bound_segs[i].x2 + offset_x,
bound_segs[i].y2 + offset_y,
- &x, &y,
- FALSE);
+ &x, &y);
gdk_points[n_gdk_points].x = PROJ_ROUND (CLAMP (x, -1, xmax));
gdk_points[n_gdk_points].y = PROJ_ROUND (CLAMP (y, -1, ymax));
@@ -1568,8 +1555,7 @@ gimp_draw_tool_draw_text_cursor (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
cursor->x, cursor->y,
- &tx1, &ty1,
- FALSE);
+ &tx1, &ty1);
if (overwrite)
{
@@ -1579,8 +1565,7 @@ gimp_draw_tool_draw_text_cursor (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
cursor->x + cursor->width,
cursor->y + cursor->height,
- &tx2, &ty2,
- FALSE);
+ &tx2, &ty2);
x = PROJ_ROUND (tx1);
y = PROJ_ROUND (ty1);
@@ -1601,8 +1586,7 @@ gimp_draw_tool_draw_text_cursor (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
cursor->x,
cursor->y + cursor->height,
- &tx2, &ty2,
- FALSE);
+ &tx2, &ty2);
/* vertical line */
gimp_canvas_draw_line (GIMP_CANVAS (shell->canvas),
@@ -1659,12 +1643,10 @@ gimp_draw_tool_on_handle (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell,
x, y,
- &tx, &ty,
- FALSE);
+ &tx, &ty);
gimp_display_shell_transform_xy_f (shell,
handle_x, handle_y,
- &handle_tx, &handle_ty,
- FALSE);
+ &handle_tx, &handle_ty);
switch (type)
{
diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c
index 5655254..cb30d9f 100644
--- a/app/tools/gimpmovetool.c
+++ b/app/tools/gimpmovetool.c
@@ -523,8 +523,7 @@ gimp_move_tool_motion (GimpTool *tool,
gimp_display_shell_transform_xy (shell,
coords->x, coords->y,
- &tx, &ty,
- FALSE);
+ &tx, &ty);
if (tx < 0 || tx >= shell->disp_width ||
ty < 0 || ty >= shell->disp_height)
diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c
index 64cf8e9..7be068c 100644
--- a/app/tools/gimpregionselecttool.c
+++ b/app/tools/gimpregionselecttool.c
@@ -394,7 +394,7 @@ gimp_region_select_tool_calculate (GimpRegionSelectTool *region_sel,
segs = g_new (GdkSegment, *num_segs);
- gimp_display_shell_transform_segments (shell, bsegs, segs, *num_segs, FALSE);
+ gimp_display_shell_transform_segments (shell, bsegs, segs, *num_segs);
g_free (bsegs);
gimp_display_shell_unset_override_cursor (shell);
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index 76de678..ef5bd1a 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -1409,13 +1409,13 @@ gimp_transform_tool_force_expose_preview (GimpTransformTool *tr_tool)
shell = gimp_display_get_shell (GIMP_DRAW_TOOL (tr_tool)->display);
gimp_display_shell_transform_xy_f (shell, tr_tool->tx1, tr_tool->ty1,
- dx + 0, dy + 0, FALSE);
+ dx + 0, dy + 0);
gimp_display_shell_transform_xy_f (shell, tr_tool->tx2, tr_tool->ty2,
- dx + 1, dy + 1, FALSE);
+ dx + 1, dy + 1);
gimp_display_shell_transform_xy_f (shell, tr_tool->tx3, tr_tool->ty3,
- dx + 2, dy + 2, FALSE);
+ dx + 2, dy + 2);
gimp_display_shell_transform_xy_f (shell, tr_tool->tx4, tr_tool->ty4,
- dx + 3, dy + 3, FALSE);
+ dx + 3, dy + 3);
/* find bounding box around preview */
area_x = area_w = (gint) dx[0];
@@ -1654,20 +1654,16 @@ gimp_transform_tool_handles_recalc (GimpTransformTool *tr_tool,
gimp_display_shell_transform_xy (gimp_display_get_shell (display),
tr_tool->tx1, tr_tool->ty1,
- &dx1, &dy1,
- FALSE);
+ &dx1, &dy1);
gimp_display_shell_transform_xy (gimp_display_get_shell (display),
tr_tool->tx2, tr_tool->ty2,
- &dx2, &dy2,
- FALSE);
+ &dx2, &dy2);
gimp_display_shell_transform_xy (gimp_display_get_shell (display),
tr_tool->tx3, tr_tool->ty3,
- &dx3, &dy3,
- FALSE);
+ &dx3, &dy3);
gimp_display_shell_transform_xy (gimp_display_get_shell (display),
tr_tool->tx4, tr_tool->ty4,
- &dx4, &dy4,
- FALSE);
+ &dx4, &dy4);
x1 = MIN (MIN (dx1, dx2), MIN (dx3, dx4));
y1 = MIN (MIN (dy1, dy2), MIN (dy3, dy4));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
