From 6be035b9ff4f9d6c9c5f5b110a77322b7b776606 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 15 Oct 2010 11:00:27 +0200 Subject: gnome-canvas: Split out matrix_transform_rect code --- libgnomecanvas/gnome-canvas-shape.c | 45 +------------------------------------ 1 file changed, 1 insertion(+), 44 deletions(-) (limited to 'libgnomecanvas/gnome-canvas-shape.c') diff --git a/libgnomecanvas/gnome-canvas-shape.c b/libgnomecanvas/gnome-canvas-shape.c index f99b10b976..d1ad26ce5b 100644 --- a/libgnomecanvas/gnome-canvas-shape.c +++ b/libgnomecanvas/gnome-canvas-shape.c @@ -487,49 +487,6 @@ gnome_canvas_shape_draw (GnomeCanvasItem *item, cairo_destroy (cr); } -static void -my_cairo_matrix_transform_rectangle (const cairo_matrix_t *matrix, - double *x1, double *y1, double *x2, double *y2) -{ - double maxx, maxy, minx, miny; - double tmpx, tmpy; - - tmpx = *x1; - tmpy = *y1; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = maxx = tmpx; - miny = maxy = tmpy; - - tmpx = *x2; - tmpy = *y1; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = MIN (minx, tmpx); - maxx = MAX (maxx, tmpx); - miny = MIN (miny, tmpy); - maxy = MAX (maxy, tmpy); - - tmpx = *x2; - tmpy = *y2; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = MIN (minx, tmpx); - maxx = MAX (maxx, tmpx); - miny = MIN (miny, tmpy); - maxy = MAX (maxy, tmpy); - - tmpx = *x1; - tmpy = *y2; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = MIN (minx, tmpx); - maxx = MAX (maxx, tmpx); - miny = MIN (miny, tmpy); - maxy = MAX (maxy, tmpy); - - *x1 = minx; - *x2 = maxx; - *y1 = miny; - *y2 = maxy; -} - static void gnome_canvas_shape_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2) { @@ -573,7 +530,7 @@ gnome_canvas_shape_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_ gnome_canvas_shape_bounds (item, &x1, &x2, &y1, &y2); gnome_canvas_item_i2w_matrix (item, &matrix); - my_cairo_matrix_transform_rectangle (&matrix, &x1, &y1, &x2, &y2); + gnome_canvas_matrix_transform_rect (&matrix, &x1, &y1, &x2, &y2); gnome_canvas_update_bbox (GNOME_CANVAS_ITEM (shape), floor (x1), floor (y1), ceil (x2), ceil (y2)); -- cgit v1.2.3