[goocanvas/new-api] 2010-07-07 Damon Chaplin <damon gnome org>



commit c0e90a9a89c260f7c06ca3745579c04042b9bd1b
Author: Damon Chaplin <damon gnome org>
Date:   Wed Jul 7 22:16:00 2010 +0100

    2010-07-07  Damon Chaplin  <damon gnome org>
    
    	    * src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
    	    removed code to support cairo pre-1.4 since we depend on >1.4 now.

 ChangeLog                 |    5 +++++
 src/goocanvasitemsimple.c |   11 -----------
 2 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 77a6563..d9ac701 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-07-07  Damon Chaplin  <damon gnome org>
 
+	* src/goocanvasitemsimple.c (goo_canvas_item_simple_get_path_bounds):
+	removed code to support cairo pre-1.4 since we depend on >1.4 now.
+
+2010-07-07  Damon Chaplin  <damon gnome org>
+
 	* Finished support for unscaled line widths, which was quite tricky as
 	goo_canvas_item_simple_set_stroke_options() needs to change behavior
 	based on where it is called - from update, paint or get_items_at().
diff --git a/src/goocanvasitemsimple.c b/src/goocanvasitemsimple.c
index 4f7c477..d65ad7b 100644
--- a/src/goocanvasitemsimple.c
+++ b/src/goocanvasitemsimple.c
@@ -1341,17 +1341,6 @@ goo_canvas_item_simple_get_path_bounds (GooCanvasItemSimple *simple,
   cairo_stroke_extents (cr, &stroke_bounds.x1, &stroke_bounds.y1,
 			&stroke_bounds.x2, &stroke_bounds.y2);
 
-  /* Workaround for cairo < 1.4.0. It used to just return odd values
-     if the path had empty bounds. This fix will work, but only if there is
-     no transform currently set, since cairo will convert to user space. */
-  if (cairo_version () < CAIRO_VERSION_ENCODE (1, 4, 0))
-    {
-      if (fill_bounds.x1 == 32767.0 && fill_bounds.x2 == -32768.0)
-	fill_bounds.x1 = fill_bounds.x2 = 0.0;
-      if (stroke_bounds.x1 == 32767.0 && stroke_bounds.x2 == -32768.0)
-	stroke_bounds.x1 = stroke_bounds.x2 = 0.0;
-    }
-
   if (fill_bounds.x1 == 0.0 && fill_bounds.x2 == 0.0)
     {
       /* The fill bounds are empty so just use the stroke bounds.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]