Update to cairo-1.7.6 API.

2008-09-22  Behdad Esfahbod  <behdad@gnome.org>

        * configure.in:
        * pango/pangocairo-render.c
        (pango_cairo_renderer_show_text_glyphs), (save_current_point):
        Update to cairo-1.7.6 API.

svn path=/trunk/; revision=2721

diff --git a/ChangeLog b/ChangeLog
index 34e253d..725278a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-22  Behdad Esfahbod  <behdad@gnome.org>
+
+       * configure.in:
+       * pango/pangocairo-render.c
+       (pango_cairo_renderer_show_text_glyphs), (save_current_point):
+       Update to cairo-1.7.6 API.
+
 2008-09-20  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 552993 – Romanian pangram

diff --git a/configure.in b/configure.in
index 7cb64fd..d238e17 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -331,7 +331,7 @@ have_cairo_xlib=false
 have_cairo_freetype=false
 have_cairo_win32=false
 have_cairo_atsui=false
-cairo_required=1.7.4
+cairo_required=1.7.6
 
 PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no]))
    

diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c
index b7b2826..ab7eed9 100644 (file)
--- a/pango/pangocairo-render.c
+++ b/pango/pangocairo-render.c
@@ -362,7 +362,7 @@ pango_cairo_renderer_show_text_glyphs (PangoRenderer        *renderer,
                              text, text_len,
                              cairo_glyphs, count,
                              clusters, num_clusters,
-                             backward);
+                             backward ? CAIRO_TEXT_CLUSTER_FLAG_BACKWARD : 0);
     else
       cairo_show_glyphs (crenderer->cr, cairo_glyphs, count);
 
@@ -710,7 +710,7 @@ save_current_point (PangoCairoRenderer *renderer)
   cairo_get_current_point (renderer->cr, &renderer->x_offset, &renderer->y_offset);
 
   /* abuse save_current_point() to cache cairo_has_show_text_glyphs() result */
-  renderer->has_show_text_glyphs = cairo_has_show_text_glyphs (renderer->cr);
+  renderer->has_show_text_glyphs = cairo_surface_has_show_text_glyphs (cairo_get_target (renderer->cr));
 }
 
 static void