[cairo-commit] src/cairo-ft-font.c

[罗晶华 Jinghua Luo]

 src/cairo-ft-font.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

New commits:
diff-tree 7e1a01092c94c7b67e95f4f4ff27c76fb5b21295 (from 4af28e639dcf7fe3332c0302295e6d590a505af7)
Author: Jinghua Luo <sunmoon1997 at gmail.com>
Date:   Sun Jun 11 18:37:59 2006 +0800

    freetype: build fix for _transform_glyph_bitmap.
    
    I sorry for this noise, I didn't notice cworth's device_{x, y}_offset
    changes. Now cairo builds again.
    paths...

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 7ec8145..3eac243 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1111,8 +1111,7 @@ _transform_glyph_bitmap (cairo_matrix_t 
      */
     original_to_transformed = *shape;
     
-    origin_x = (*surface)->base.device_x_offset;
-    origin_y = (*surface)->base.device_y_offset;
+    cairo_surface_get_device_offset (&(*surface)->base, &origin_x, &origin_y);
     origin_width = cairo_image_surface_get_width (&(*surface)->base);
     origin_height = cairo_image_surface_get_height (&(*surface)->base);
 
@@ -1200,9 +1199,9 @@ _transform_glyph_bitmap (cairo_matrix_t 
     (*surface) = (cairo_image_surface_t *)image;
     cairo_surface_destroy (&old_image->base);
 
-    (*surface)->base.device_x_offset = - floor (origin_x + 0.5);
-    (*surface)->base.device_y_offset = - floor (origin_y + 0.5);
-
+    cairo_surface_set_device_offset (&(*surface)->base,
+				     - floor (origin_x + 0.5),
+				     - floor (origin_y + 0.5));
     return status;
 }