[evolution/rendering-cleanup: 56/97] gnome-canvas: Fix bounding box calculation in GnomeCanvasShape

[Benjamin Otte <otte src gnome org>]

commit a044e2e989a2ed193b262775b5c32f9a7f2a9a69
Author: Benjamin Otte <otte redhat com>
Date:   Sun Oct 17 15:33:12 2010 +0200

    gnome-canvas: Fix bounding box calculation in GnomeCanvasShape
    
    The code converted the bbox to world coordinates, not to canvas
    coordinates.
    
    xxx: shape

 libgnomecanvas/gnome-canvas-shape.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/libgnomecanvas/gnome-canvas-shape.c b/libgnomecanvas/gnome-canvas-shape.c
index 346230a..334eff8 100644
--- a/libgnomecanvas/gnome-canvas-shape.c
+++ b/libgnomecanvas/gnome-canvas-shape.c
@@ -517,7 +517,6 @@ gnome_canvas_shape_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gin
 	GnomeCanvasShape * shape;
 	GnomeCanvasShapePriv * priv;
         double x1, x2, y1, y2;
-        cairo_matrix_t matrix;
 
 	shape = GNOME_CANVAS_SHAPE (item);
 
@@ -528,9 +527,7 @@ gnome_canvas_shape_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gin
 		GNOME_CANVAS_ITEM_CLASS (gnome_canvas_shape_parent_class)->update (item, i2c, flags);
 
         gnome_canvas_shape_bounds (item, &x1, &x2, &y1, &y2);
-        gnome_canvas_item_i2w_matrix (item, &matrix);
-
-        gnome_canvas_matrix_transform_rect (&matrix, &x1, &y1, &x2, &y2);
+        gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2);
         gnome_canvas_update_bbox (GNOME_CANVAS_ITEM (shape),
                                   floor (x1), floor (y1),
                                   ceil (x2), ceil (y2));