[cairo-commit] src/cairo-cff-subset.c src/cairo-truetype-subset.c

Adrian Johnson ajohnson at kemper.freedesktop.org
Tue Nov 23 04:57:59 PST 2010


 src/cairo-cff-subset.c      |    2 +-
 src/cairo-truetype-subset.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8db239660fab35970784bfa3bd7e7ba0cdaf46d4
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Nov 23 23:26:49 2010 +1030

    Check is_synthetic() font backend exists before calling it

diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
index a01d55e..1e6724f 100644
--- a/src/cairo-cff-subset.c
+++ b/src/cairo-cff-subset.c
@@ -1907,7 +1907,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     /* We need to use a fallback font generated from the synthesized outlines. */
-    if (backend->is_synthetic (scaled_font_subset->scaled_font))
+    if (backend->is_synthetic && backend->is_synthetic (scaled_font_subset->scaled_font))
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     data_length = 0;
diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c
index a703343..9e0aaa5 100644
--- a/src/cairo-truetype-subset.c
+++ b/src/cairo-truetype-subset.c
@@ -157,7 +157,7 @@ _cairo_truetype_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
      */
 
     /* We need to use a fallback font generated from the synthesized outlines. */
-    if (backend->is_synthetic (scaled_font_subset->scaled_font))
+    if (backend->is_synthetic && backend->is_synthetic (scaled_font_subset->scaled_font))
        return CAIRO_INT_STATUS_UNSUPPORTED;
 
     size = sizeof (tt_head_t);


More information about the cairo-commit mailing list