[cairo-commit] Branch '1.2' - src/cairo-beos-surface.cpp

Christian Biesinger biesi at kemper.freedesktop.org
Thu Oct 26 13:12:55 PDT 2006


 src/cairo-beos-surface.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

New commits:
diff-tree a08c0b43e2c2fd1a5070911edef448940fcab35a (from a5f068e10d72c20a55d20ca9f79508361d13fb80)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Thu Oct 26 21:40:35 2006 +0200

    [beos] Fix build error
    
    Rename cairo_rectangle_fixed_t to cairo_rectangle_int16_t
    as needed per commit 746f66c3fce6de39ac9afa7be8bcf8f74c750e85.
    (cherry picked from 05a259d49368fb128b99d99f3776f8783df9d4ed commit)

diff --git a/src/cairo-beos-surface.cpp b/src/cairo-beos-surface.cpp
index 4d8dfc7..668a209 100644
--- a/src/cairo-beos-surface.cpp
+++ b/src/cairo-beos-surface.cpp
@@ -101,17 +101,17 @@ _cairo_beos_surface_create_internal (BVi
 				     bool     owns_bitmap_view = false);
 
 static BRect
-_cairo_rect_to_brect (const cairo_rectangle_fixed_t* rect)
+_cairo_rect_to_brect (const cairo_rectangle_int16_t* rect)
 {
     // A BRect is one pixel wider than you'd think
     return BRect(rect->x, rect->y, rect->x + rect->width - 1,
 	    	 rect->y + rect->height - 1);
 }
 
-static cairo_rectangle_fixed_t
+static cairo_rectangle_int16_t
 _brect_to_cairo_rect (const BRect& rect)
 {
-    cairo_rectangle_fixed_t retval;
+    cairo_rectangle_int16_t retval;
     retval.x = int(rect.left + 0.5);
     retval.y = int(rect.top + 0.5);
     retval.width = rect.IntegerWidth() + 1;
@@ -550,9 +550,9 @@ _cairo_beos_surface_release_source_image
 
 static cairo_status_t
 _cairo_beos_surface_acquire_dest_image (void			 *abstract_surface,
-                                        cairo_rectangle_fixed_t	 *interest_rect,
+                                        cairo_rectangle_int16_t	 *interest_rect,
                                         cairo_image_surface_t	**image_out,
-                                        cairo_rectangle_fixed_t	 *image_rect,
+                                        cairo_rectangle_int16_t	 *image_rect,
                                         void			**image_extra)
 {
     cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
@@ -615,9 +615,9 @@ _cairo_beos_surface_acquire_dest_image (
 
 static void
 _cairo_beos_surface_release_dest_image (void			*abstract_surface,
-                                        cairo_rectangle_fixed_t	*intersect_rect,
+                                        cairo_rectangle_int16_t	*intersect_rect,
                                         cairo_image_surface_t	*image,
-                                        cairo_rectangle_fixed_t	*image_rect,
+                                        cairo_rectangle_int16_t	*image_rect,
                                         void			*image_extra)
 {
     fprintf(stderr, "Fallback drawing\n");
@@ -768,7 +768,7 @@ _cairo_beos_surface_composite (cairo_ope
 
 static void
 _cairo_beos_surface_fill_rectangle (cairo_beos_surface_t	*surface,
-				    cairo_rectangle_fixed_t	*rect)
+				    cairo_rectangle_int16_t	*rect)
 {
     BRect brect(_cairo_rect_to_brect(rect));
     surface->view->FillRect(brect);
@@ -778,7 +778,7 @@ static cairo_int_status_t
 _cairo_beos_surface_fill_rectangles (void			*abstract_surface,
 				     cairo_operator_t		 op,
 				     const cairo_color_t	*color,
-				     cairo_rectangle_fixed_t	*rects,
+				     cairo_rectangle_int16_t	*rects,
 				     int			 num_rects)
 {
     fprintf(stderr, "Drawing %i rectangles\n", num_rects);
@@ -863,7 +863,7 @@ _cairo_beos_surface_set_clip_region (voi
 
 static cairo_int_status_t
 _cairo_beos_surface_get_extents (void				*abstract_surface,
-				 cairo_rectangle_fixed_t	*rectangle)
+				 cairo_rectangle_int16_t	*rectangle)
 {
     cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
 							abstract_surface);


More information about the cairo-commit mailing list