Code

Fixed messed up transformations because of a missing cairo_restore() and removed...
[inkscape.git] / src / extension / internal / pdf-cairo.cpp
index d70b94148175d67ab803366d79e074b837d583d2..4baab1740c0f7f253d036af9a610d256082943c0 100644 (file)
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_CAIRO_PDF
+
 #ifndef PANGO_ENABLE_BACKEND
 #define PANGO_ENABLE_BACKEND
 #endif
 
 #include <cairo.h>
 #include <cairo-pdf.h>
-#include <cairo-ft.h>
 
 #include <pango/pango.h>
 #include <pango/pangofc-fontmap.h>
 
 #ifdef RENDER_WITH_PANGO_CAIRO
 #include <pango/pangocairo.h>
+#else
+#include <cairo-ft.h>
 #endif
-
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
@@ -86,8 +88,6 @@ PrintCairoPDF::PrintCairoPDF() :
     _dpi(72),
     _bitmap(false)
 {
-    _num_alphas = 8;
-    _alpha_stack = (float*)malloc(sizeof(float) * _num_alphas);
 }
 
 PrintCairoPDF::~PrintCairoPDF(void)
@@ -96,8 +96,6 @@ PrintCairoPDF::~PrintCairoPDF(void)
     if (pdf_surface) cairo_surface_destroy(pdf_surface);
     if (_layout) g_object_unref(_layout);
     
-    free(_alpha_stack);
-
     /* restore default signal handling for SIGPIPE */
 #if !defined(_WIN32) && !defined(__WIN32__)
     (void) signal(SIGPIPE, SIG_DFL);
@@ -245,8 +243,8 @@ PrintCairoPDF::begin(Inkscape::Extension::Print *mod, SPDocument *doc)
     FILE *osf = NULL;
     FILE *osp = NULL;
 
-    _alpha_ptr = 0;
-    _alpha_stack[_alpha_ptr] = 1.0;
+    _alpha_stack.clear();
+    _alpha_stack.push_back(1.0);
 
     gsize bytesRead = 0;
     gsize bytesWritten = 0;
@@ -384,18 +382,18 @@ PrintCairoPDF::bind(Inkscape::Extension::Print *mod, NRMatrix const *transform,
     if (!_stream) return 0;  // XXX: fixme, returning -1 as unsigned.
     if (_bitmap) return 0;
     
-    cairo_save(cr);
+    if (opacity < 1.0) {
+        cairo_push_group(cr);
+    } else {
+        cairo_save(cr);
+    }
     _concat_transform(cr, transform->c[0], transform->c[1], transform->c[2], transform->c[3], transform->c[4], transform->c[5]);
 //    g_printf("bind: (%f) %f %f %f %f %f %f\n", opacity, transform->c[0], transform->c[1], transform->c[2], transform->c[3], transform->c[4], transform->c[5]);
     // remember these to be able to undo them when outputting text
     _last_tx = transform->c[4];
     _last_ty = transform->c[5];
     
-    if (_num_alphas <= ++_alpha_ptr) {
-        _num_alphas *= 2;
-        _alpha_stack = (float*)realloc((void*)_alpha_stack, sizeof(float) * _num_alphas);
-    }
-    _alpha_stack[_alpha_ptr] = _alpha_stack[_alpha_ptr-1] * opacity;
+    _alpha_stack.push_back(opacity);
     
     return 1;
 }
@@ -405,11 +403,18 @@ PrintCairoPDF::release(Inkscape::Extension::Print *mod)
 {
     if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
     if (_bitmap) return 0;
+
+    float opacity = _alpha_stack.back();
     
-    cairo_restore(cr);
+    if (opacity < 1.0) {
+        cairo_pop_group_to_source(cr);
+        cairo_paint_with_alpha(cr, opacity);
+    } else {
+        cairo_restore(cr);
+    }
 //    g_printf("release\n");
-    if (_alpha_ptr > 0)
-        _alpha_ptr--;
+    _alpha_stack.pop_back();
+    g_assert(_alpha_stack.size() > 0);
 
     return 1;
 }
@@ -492,12 +497,12 @@ PrintCairoPDF::create_pattern_for_paint(SPPaintServer const *const paintserver,
                        case SP_GRADIENT_SPREAD_REPEAT:
                                cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
                                break;
-                       case SP_GRADIENT_SPREAD_REFLECT:        // not supported by cairo-pdf yet
-                               //cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REFLECT);
-                               //break;
+                       case SP_GRADIENT_SPREAD_REFLECT:
+                               cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REFLECT);
+                               break;
                        case SP_GRADIENT_SPREAD_PAD:
             default:
-                               cairo_pattern_set_extend(pattern, CAIRO_EXTEND_NONE);   // PAD not supported by cairo-pdf yet
+                               cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD);
                                break;
                }
 
@@ -528,21 +533,19 @@ PrintCairoPDF::create_pattern_for_paint(SPPaintServer const *const paintserver,
 void
 PrintCairoPDF::print_fill_style(cairo_t *cr, SPStyle const *const style, NRRect const *pbox)
 {
-    g_return_if_fail( style->fill.type == SP_PAINT_TYPE_COLOR
-                      || ( style->fill.type == SP_PAINT_TYPE_PAINTSERVER
+    g_return_if_fail( style->fill.isColor()
+                      || ( style->fill.isPaintserver()
                            && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) );
     
-    if (style->fill.type == SP_PAINT_TYPE_COLOR) {
+    if (style->fill.isColor()) {
         float rgb[3];
         sp_color_get_rgb_floatv(&style->fill.value.color, rgb);
 
-        float alpha = 1.0;
-        alpha *= SP_SCALE24_TO_FLOAT(style->fill_opacity.value);
-        alpha *= _alpha_stack[_alpha_ptr];
+        float alpha = SP_SCALE24_TO_FLOAT(style->fill_opacity.value);
 
         cairo_set_source_rgba(cr, rgb[0], rgb[1], rgb[2], alpha);
     } else {
-        g_assert( style->fill.type == SP_PAINT_TYPE_PAINTSERVER
+        g_assert( style->fill.isPaintserver()
                   && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) );
 
         cairo_pattern_t *pattern = create_pattern_for_paint(SP_STYLE_FILL_SERVER(style), pbox, 1.0);
@@ -561,25 +564,23 @@ PrintCairoPDF::fill(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRMat
     if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
     if (_bitmap) return 0;
 
-    if ( style->fill.type == SP_PAINT_TYPE_COLOR
-        || ( style->fill.type == SP_PAINT_TYPE_PAINTSERVER
-             && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) ) {
-        
-        float alpha = 1.0;
-        alpha *= SP_SCALE24_TO_FLOAT(style->fill_opacity.value);
-        alpha *= _alpha_stack[_alpha_ptr];
-               
+    if ( style->fill.isColor()
+         || ( style->fill.isPaintserver()
+              && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) ) {
+
+        float alpha = SP_SCALE24_TO_FLOAT(style->fill_opacity.value);
+
         cairo_save(cr);
-        
+
         print_fill_style(cr, style, pbox);
         print_bpath(cr, bpath->path);
-        if (style->fill_rule.value == SP_WIND_RULE_EVENODD) {
+        if (style->fill_rule.computed == SP_WIND_RULE_EVENODD) {
             cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD);
         } else {
             cairo_set_fill_rule(cr, CAIRO_FILL_RULE_WINDING);
         }
         if (alpha != 1.0 &&
-            style->fill.type != SP_PAINT_TYPE_COLOR) {
+            !style->fill.isColor()) {
 
             cairo_clip (cr);
             cairo_paint_with_alpha (cr, alpha);
@@ -596,16 +597,14 @@ PrintCairoPDF::fill(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRMat
 void
 PrintCairoPDF::print_stroke_style(cairo_t *cr, SPStyle const *style, NRRect const *pbox)
 {
-    float alpha = 1.0;
-    alpha *= SP_SCALE24_TO_FLOAT(style->stroke_opacity.value);
-    alpha *= _alpha_stack[_alpha_ptr];
+    float alpha = SP_SCALE24_TO_FLOAT(style->stroke_opacity.value);
 
-    if ( style->stroke.type == SP_PAINT_TYPE_COLOR ) {
+    if ( style->stroke.isColor() ) {
         float rgb[3];
         sp_color_get_rgb_floatv(&style->stroke.value.color, rgb);
       
         cairo_set_source_rgba(cr, rgb[0], rgb[1], rgb[2], alpha);
-    } else if ( style->stroke.type == SP_PAINT_TYPE_PAINTSERVER
+    } else if ( style->stroke.isPaintserver()
                   && SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style)) ) {
 
         cairo_pattern_t *pattern = create_pattern_for_paint(SP_STYLE_STROKE_SERVER(style), pbox, alpha);
@@ -665,16 +664,16 @@ PrintCairoPDF::stroke(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRM
     if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
     if (_bitmap) return 0;
 
-    if ( style->stroke.type == SP_PAINT_TYPE_COLOR ||
-        ( style->stroke.type == SP_PAINT_TYPE_PAINTSERVER
+    if ( style->stroke.isColor() ||
+         ( style->stroke.isPaintserver()
               && SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style)) ) ) {
 
-       cairo_save(cr);
-       
-       print_stroke_style(cr, style, pbox);
+        cairo_save(cr);
+
+        print_stroke_style(cr, style, pbox);
         print_bpath(cr, bpath->path);
         cairo_stroke(cr);
-               
+
         cairo_restore(cr);
     }
 
@@ -691,7 +690,7 @@ PrintCairoPDF::image(Inkscape::Extension::Print *mod, guchar *px, unsigned int w
     guchar* px_rgba = (guchar*)g_malloc(4 * w * h);
     if (!px_rgba) return 0;
     
-    float alpha = _alpha_stack[_alpha_ptr];
+    float alpha = _alpha_stack.back();
 
     // make a copy of the original pixbuf with premultiplied alpha
     // if we pass the original pixbuf it will get messed up
@@ -717,7 +716,7 @@ PrintCairoPDF::image(Inkscape::Extension::Print *mod, guchar *px, unsigned int w
     
     cairo_surface_t *image_surface = cairo_image_surface_create_for_data(px_rgba, CAIRO_FORMAT_ARGB32, w, h, w * 4);
     if (cairo_surface_status(image_surface)) {
-       g_printf("%s\n", cairo_status_to_string(cairo_surface_status(image_surface)));
+        g_printf("Error: %s\n", cairo_status_to_string(cairo_surface_status(image_surface)));
        return 0;
     }
     
@@ -885,8 +884,8 @@ PrintCairoPDF::text(Inkscape::Extension::Print *mod, char const *text, NR::Point
     cairo_set_font_matrix(cr, &matrix);
 #endif
     
-    if ( style->fill.type == SP_PAINT_TYPE_COLOR
-         || ( style->fill.type == SP_PAINT_TYPE_PAINTSERVER
+    if ( style->fill.isColor()
+         || ( style->fill.isPaintserver()
               && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) )
     {
         // set fill style
@@ -905,8 +904,8 @@ PrintCairoPDF::text(Inkscape::Extension::Print *mod, char const *text, NR::Point
 #endif
     }
 
-    if (style->stroke.type == SP_PAINT_TYPE_COLOR
-         || ( style->stroke.type == SP_PAINT_TYPE_PAINTSERVER
+    if (style->stroke.isColor()
+        || ( style->stroke.isPaintserver()
               && SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style)) ) )
     {
         // set stroke style
@@ -1037,6 +1036,8 @@ PrintCairoPDF::init(void)
 
 /* End of GNU GPL code */
 
+#endif /* HAVE_CAIRO_PDF */
+
 
 /*
   Local Variables: