[cairo-commit] 4 commits - src/cairo-image-compositor.c src/skia test/a1-clip-fill-equal.ref.png test/a1-clip-fill.ref.png test/a1-clip-paint.ref.png test/a1-clip-stroke.ref.png test/Makefile.refs test/random-clip.ref.png

[Chris Wilson]

 src/cairo-image-compositor.c    |    5 ++---
 src/skia/cairo-skia-surface.cpp |    1 -
 test/Makefile.refs              |    1 +
 test/a1-clip-fill-equal.ref.png |binary
 test/a1-clip-fill.ref.png       |binary
 test/a1-clip-paint.ref.png      |binary
 test/a1-clip-stroke.ref.png     |binary
 test/random-clip.ref.png        |binary
 8 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9ab9d635cd54b36c701bed29b6029b002e9bcc36
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 14 23:08:19 2011 +0100

    test: Add ref image for random-clip
    
    After applying geometric clip intersection, this is the acceptable
    result.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.refs b/test/Makefile.refs
index df07644..44a32a0 100644
--- a/test/Makefile.refs
+++ b/test/Makefile.refs
@@ -1019,6 +1019,7 @@ REFERENCE_IMAGES = \
 	radial-gradient.image16.ref.png \
 	radial-gradient.quartz.ref.png \
 	radial-gradient.ref.png \
+	random-clip.ref.png \
 	random-intersections-curves-eo.image16.ref.png \
 	random-intersections-curves-eo.pdf.ref.png \
 	random-intersections-curves-eo.ps.ref.png \
diff --git a/test/random-clip.ref.png b/test/random-clip.ref.png
new file mode 100644
index 0000000..c74021c
Binary files /dev/null and b/test/random-clip.ref.png differ
commit 8f9691f2b7e51ba1d88a879f887e4c97b069e5fa
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 14 23:06:31 2011 +0100

    test: Fix ref images for a1-clip-*
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/a1-clip-fill-equal.ref.png b/test/a1-clip-fill-equal.ref.png
index b4e81eb..384ba4a 100644
Binary files a/test/a1-clip-fill-equal.ref.png and b/test/a1-clip-fill-equal.ref.png differ
diff --git a/test/a1-clip-fill.ref.png b/test/a1-clip-fill.ref.png
index b4e81eb..384ba4a 100644
Binary files a/test/a1-clip-fill.ref.png and b/test/a1-clip-fill.ref.png differ
diff --git a/test/a1-clip-paint.ref.png b/test/a1-clip-paint.ref.png
index b4e81eb..384ba4a 100644
Binary files a/test/a1-clip-paint.ref.png and b/test/a1-clip-paint.ref.png differ
diff --git a/test/a1-clip-stroke.ref.png b/test/a1-clip-stroke.ref.png
index b4e81eb..384ba4a 100644
Binary files a/test/a1-clip-stroke.ref.png and b/test/a1-clip-stroke.ref.png differ
commit 472e4515de8896abfa605fda35d6c18bfa6958d2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 14 20:17:02 2011 +0100

    image: fix compilation of spans with LERP

diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
index e41a52d..3e91a06 100644
--- a/src/cairo-image-compositor.c
+++ b/src/cairo-image-compositor.c
@@ -1166,15 +1166,14 @@ span_renderer_init (cairo_abstract_span_renderer_t	*_r,
     int mask_x, mask_y;
 
     if (op == CAIRO_OPERATOR_CLEAR) {
-	source = &_cairo_pattern_white.base;
-	op = PIXMAN_OP_OUT_REVERSE;
+	op = PIXMAN_OP_LERP_CLEAR;
     } else if (dst->base.is_clear &&
 	       (op == CAIRO_OPERATOR_SOURCE ||
 		op == CAIRO_OPERATOR_OVER ||
 		op == CAIRO_OPERATOR_ADD)) {
 	op = PIXMAN_OP_SRC;
     } else if (op == CAIRO_OPERATOR_SOURCE) {
-	op = PIXMAN_OP_LERP;
+	op = PIXMAN_OP_LERP_SRC;
     } else {
 	op = _pixman_operator (op);
     }
commit 872e1c87b31a1e8199ec6aa4cf5c0b0647ceb0ea
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 14 20:15:40 2011 +0100

    skia: fix compilation

diff --git a/src/skia/cairo-skia-surface.cpp b/src/skia/cairo-skia-surface.cpp
index 56b4dca..de94f3a 100644
--- a/src/skia/cairo-skia-surface.cpp
+++ b/src/skia/cairo-skia-surface.cpp
@@ -176,7 +176,6 @@ cairo_skia_surface_backend = {
     _cairo_skia_surface_unmap_image,
 
     _cairo_skia_surface_acquire_source_image,
-    NULL, /* acquire transformed */
     _cairo_skia_surface_release_source_image,
     NULL, /* snapshot */