[cairo-commit] 2 commits - src/cairo-scaled-font-subsets.c src/cairo-svg-surface.c

[Chris Wilson]

 src/cairo-scaled-font-subsets.c |    4 ++--
 src/cairo-svg-surface.c         |    7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit d83a4d9905a68c3060e689015bffb03137fcbb0f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 17 21:19:48 2008 +0100

    [svg] Emit user-fonts.
    
    Iterate over the user fonts subsets and emit the scaled glyphs.

diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 97ceedd..63b0bfb 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -752,7 +752,14 @@ _cairo_svg_document_emit_font_subsets (cairo_svg_document_t *document)
     status = _cairo_scaled_font_subsets_foreach_scaled (document->font_subsets,
                                                         _cairo_svg_document_emit_font_subset,
                                                         document);
+    if (status)
+	goto FAIL;
 
+    status = _cairo_scaled_font_subsets_foreach_user (document->font_subsets,
+						      _cairo_svg_document_emit_font_subset,
+						      document);
+
+  FAIL:
     _cairo_scaled_font_subsets_destroy (document->font_subsets);
     document->font_subsets = NULL;
 
commit eb39151fdc4e72f0836d6fbb5df54885352b3b87
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 17 21:19:13 2008 +0100

    [scaled-fonts] Correct the order of scaled/user arguments.

diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 9d44ed5..365c74c 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -870,8 +870,8 @@ _cairo_scaled_font_subsets_foreach_scaled (cairo_scaled_font_subsets_t		    *fon
     return _cairo_scaled_font_subsets_foreach_internal (font_subsets,
                                                         font_subset_callback,
                                                         closure,
-                                                        FALSE,
-                                                        TRUE);
+                                                        TRUE,
+                                                        FALSE);
 }
 
 cairo_status_t