Fix bugs

 - Fix span renderer (WEB-1460)
 - Create image cache surface with msaa disabled
 - Change _cairo_path_fixed_stroke_to_traps to
   _cairo_path_fixed_stroke_polygon_to_traps

Change-Id: I02bca560082eaa4593a5a8cb14553bde7f971c08

diff --git a/debian/changelog b/debian/changelog
index 10dd24f..69de789 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+cairo (1.12.12-slp2+3) unstable; urgency=low
+
+  * Fix bugs in w3c conformance test
+  * Git: framework/graphics/cairo
+
+ -- Dongyeon Kim <dy5.kim@samsung.com>  Tue, 26 Mar 2013 15:09:23 +0900
+
+cairo (1.12.12-slp2+2) unstable; urgency=low
+
+  * Fix the bug regarding span_renderer (WEB-1460)
+  * Git: framework/graphics/cairo
+  * Tag: cairo_1.12.12+2
+
+ -- Seongwon Cho <seongwon1.cho@samsung.com>  Wed, 20 Mar 2013 16:36:26 +0900
+
 cairo (1.12.8-slp2+3) unstable; urgency=low
 
   * Remove gobject, script-interpreter libraries from package

diff --git a/packaging/cairo.spec b/packaging/cairo.spec
index 2dc7e04..edbbe50 100644 (file)
--- a/packaging/cairo.spec
+++ b/packaging/cairo.spec
@@ -2,7 +2,7 @@
 Name:       cairo
 Summary:    A vector graphics library
 Version:    1.12.12
-Release:    1
+Release:    3
 Group:      System/Libraries
 License:    LGPLv2 or MPLv1.1
 URL:        http://www.cairographics.org

diff --git a/src/cairo-gl-device.c b/src/cairo-gl-device.c
index aa91f72..da14c6c 100644 (file)
--- a/src/cairo-gl-device.c
+++ b/src/cairo-gl-device.c
@@ -62,7 +62,7 @@ _cairo_gl_image_cache_init (cairo_gl_context_t *ctx)
 
     _cairo_surface_release_device_reference (cache_surface);
     ctx->image_cache.surface = (cairo_gl_surface_t *)cache_surface;
-
+    ctx->image_cache.surface->supports_msaa = FALSE;
 
     return CAIRO_INT_STATUS_SUCCESS;
 }

diff --git a/src/cairo-gl-msaa-compositor.c b/src/cairo-gl-msaa-compositor.c
index 39f5db4..3c48d2e 100755 (executable)
--- a/src/cairo-gl-msaa-compositor.c
+++ b/src/cairo-gl-msaa-compositor.c
@@ -799,7 +799,7 @@ _cairo_gl_msaa_compositor_stroke (const cairo_compositor_t  *compositor,
 
        _cairo_traps_init (&traps);
 
-       status = _cairo_path_fixed_stroke_to_traps (path, style,
+       status = _cairo_path_fixed_stroke_polygon_to_traps (path, style,
                                                    ctm, ctm_inverse,
                                                    tolerance, &traps);
        if (unlikely (status)) {

diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
index 5dfdeae..55643b9 100755 (executable)
--- a/src/cairo-image-compositor.c
+++ b/src/cairo-image-compositor.c
@@ -3071,11 +3071,12 @@ span_renderer_fini (cairo_abstract_span_renderer_t *_r,
 
     TRACE ((stderr, "%s\n", __FUNCTION__));
 
-    if (likely (status == CAIRO_INT_STATUS_SUCCESS && r->bpp == 0)) {
-       const cairo_composite_rectangles_t *composite = r->composite;
-
+    if (likely (status == CAIRO_INT_STATUS_SUCCESS)) {
        if (r->base.finish)
            r->base.finish (r);
+    }
+    if (likely (status == CAIRO_INT_STATUS_SUCCESS && r->bpp == 0)) {
+       const cairo_composite_rectangles_t *composite = r->composite;
 
        pixman_image_composite32 (r->op, r->src, r->mask,
                                  to_pixman_image (composite->surface),