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

[Adrian Johnson]

 src/cairo-pdf-surface.c         |   12 ++++++++----
 src/cairo-scaled-font-subsets.c |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 3a83bc8617dae3cc2bfea862f252338463871648
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Oct 2 23:28:10 2009 +0930

    PDF: Fix regression caused by 1ae5a419
    
        Bug 24240 acroread prints error message when printing

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index ac78f58..896980a 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -5335,6 +5335,10 @@ _cairo_pdf_surface_paint (void			*abstract_surface,
     if (unlikely (status))
 	return status;
 
+    status = _cairo_pdf_operators_flush (&surface->pdf_operators);
+    if (unlikely (status))
+	return status;
+
     if (source->type == CAIRO_PATTERN_TYPE_SURFACE &&
 	  source->extend == CAIRO_EXTEND_NONE) {
 
@@ -5389,10 +5393,6 @@ _cairo_pdf_surface_paint (void			*abstract_surface,
 	if (unlikely (status))
 	    return status;
 
-	status = _cairo_pdf_operators_flush (&surface->pdf_operators);
-	if (unlikely (status))
-	    return status;
-
 	_cairo_output_stream_printf (surface->output,
 				     "q /s%d gs /x%d Do Q\n",
 				     gstate_res.id,
@@ -5652,6 +5652,10 @@ _cairo_pdf_surface_fill (void			*abstract_surface,
     if (source->type == CAIRO_PATTERN_TYPE_SURFACE &&
 	  source->extend == CAIRO_EXTEND_NONE) {
 
+	status = _cairo_pdf_operators_flush (&surface->pdf_operators);
+	if (unlikely (status))
+	    return status;
+
 	_cairo_output_stream_printf (surface->output, "q\n");
 	status =  _cairo_pdf_operators_clip (&surface->pdf_operators,
 					     path,
commit 91a4f59f135dd42a28e14be55d1f08712c0c3097
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Oct 2 23:11:54 2009 +0930

    PDF: Fix regression caused by 1ae5a419
    
    Bug 24240 first char missing when printing a PDF.

diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 6eb3128..0547829 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -294,7 +294,7 @@ _cairo_sub_font_create (cairo_scaled_font_subsets_t	*parent,
 
     /* Reserve first glyph in subset for the .notdef glyph except for
      * Type 3 fonts */
-    if (! scaled_font) {
+    if (! is_scaled) {
 	status = _cairo_sub_font_map_glyph (sub_font, 0, NULL, -1, &subset_glyph);
 	if (unlikely (status)) {
 	    _cairo_hash_table_destroy (sub_font->sub_font_glyphs);