[cairo-commit] 5 commits - src/cairo-image-source.c test/create-from-png-stream.c test/Makefile.refs test/reference

[Chris Wilson]

 dev/null                                               |binary
 src/cairo-image-source.c                               |    9 +++++++--
 test/Makefile.refs                                     |    3 ++-
 test/create-from-png-stream.c                          |    2 +-
 test/reference/clip-operator.argb32.ref.png            |binary
 test/reference/ft-text-vertical-layout-type1.xfail.png |binary
 test/reference/hatchings.ref.png                       |binary
 test/reference/twin-antialias-none.ref.png             |binary
 8 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 62e1ded35c4d8d3139152661afea61b628152d47
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 15 17:10:43 2011 +0100

    test: Update couple of refs for the improved mono rasteriser
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/reference/hatchings.ref.png b/test/reference/hatchings.ref.png
index 3b34e5c..449d040 100644
Binary files a/test/reference/hatchings.ref.png and b/test/reference/hatchings.ref.png differ
diff --git a/test/reference/twin-antialias-none.ref.png b/test/reference/twin-antialias-none.ref.png
index 42f386d..d00e501 100644
Binary files a/test/reference/twin-antialias-none.ref.png and b/test/reference/twin-antialias-none.ref.png differ
commit e5d890e1ea5c3b0ec68126ecde4b957a924bc165
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 15 17:06:51 2011 +0100

    test: Update refernece dir for create-from-png-stream
    
    It tries to load its reference image and fails because I moved it.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/create-from-png-stream.c b/test/create-from-png-stream.c
index a5c5395..23b265b 100644
--- a/test/create-from-png-stream.c
+++ b/test/create-from-png-stream.c
@@ -54,7 +54,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_surface_t *surface;
     cairo_status_t status;
 
-    xasprintf (&filename, "%s/%s", ctx->srcdir,
+    xasprintf (&filename, "%s/reference/%s", ctx->srcdir,
 	       "create-from-png-stream.ref.png");
 
     file = fopen (filename, "rb");
commit 8e827e2cbbd6920d0c2bbd87e7e40a265ac5dba1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 15 17:02:12 2011 +0100

    test: Record the failure of recent freetype libraries for type1 vertical layout

diff --git a/test/Makefile.refs b/test/Makefile.refs
index 6882230..312ed8a 100644
--- a/test/Makefile.refs
+++ b/test/Makefile.refs
@@ -883,6 +883,7 @@ REFERENCE_IMAGES = \
 	reference/ft-text-vertical-layout-type1.quartz.xfail.png \
 	reference/ft-text-vertical-layout-type1.ref.png \
 	reference/ft-text-vertical-layout-type1.svg.ref.png \
+	reference/ft-text-vertical-layout-type1.xfail.png \
 	reference/ft-text-vertical-layout-type1.xlib.ref.png \
 	reference/ft-text-vertical-layout-type3.base.argb32.ref.png \
 	reference/ft-text-vertical-layout-type3.base.rgb24.ref.png \
diff --git a/test/reference/ft-text-vertical-layout-type1.xfail.png b/test/reference/ft-text-vertical-layout-type1.xfail.png
new file mode 100644
index 0000000..063bbd9
Binary files /dev/null and b/test/reference/ft-text-vertical-layout-type1.xfail.png differ
commit 36dc0971eaf3bf5d6cdbd826a5f92988031a3074
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 15 16:59:33 2011 +0100

    test: refresh clip-operator ref.png

diff --git a/test/Makefile.refs b/test/Makefile.refs
index 88a9a93..6882230 100644
--- a/test/Makefile.refs
+++ b/test/Makefile.refs
@@ -320,6 +320,7 @@ REFERENCE_IMAGES = \
 	reference/clip-nesting.rgb24.ref.png \
 	reference/clip-nesting.test-paginated.rgb24.ref.png \
 	reference/clip-nesting.xlib.rgb24.ref.png \
+	reference/clip-operator.argb32.ref.png \
 	reference/clip-operator.base.argb32.ref.png \
 	reference/clip-operator.base.rgb24.ref.png \
 	reference/clip-operator.gl.argb32.ref.png \
@@ -332,7 +333,6 @@ REFERENCE_IMAGES = \
 	reference/clip-operator.ps3.rgb24.ref.png \
 	reference/clip-operator.quartz.argb32.ref.png \
 	reference/clip-operator.quartz.rgb24.ref.png \
-	reference/clip-operator.ref.png \
 	reference/clip-operator.rgb24.ref.png \
 	reference/clip-operator.svg12.argb32.xfail.png \
 	reference/clip-operator.svg12.rgb24.xfail.png \
diff --git a/test/reference/clip-operator.argb32.ref.png b/test/reference/clip-operator.argb32.ref.png
new file mode 100644
index 0000000..965d921
Binary files /dev/null and b/test/reference/clip-operator.argb32.ref.png differ
diff --git a/test/reference/clip-operator.ref.png b/test/reference/clip-operator.ref.png
deleted file mode 100644
index 8d3b34d..0000000
Binary files a/test/reference/clip-operator.ref.png and /dev/null differ
commit af6ee4e82e912eec5ae0e20ed54a868d1abe98d3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 15 16:57:52 2011 +0100

    image: Invert recording matrix before replay
    
    Hmm, still not quite right but an improvement.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-image-source.c b/src/cairo-image-source.c
index 7c1eb82..63fcc2f 100644
--- a/src/cairo-image-source.c
+++ b/src/cairo-image-source.c
@@ -639,7 +639,7 @@ _pixman_image_for_recording (cairo_image_surface_t *dst,
     } else
 	extend = CAIRO_EXTEND_NONE;
 
-    if (extents == CAIRO_EXTEND_NONE)
+    if (extend == CAIRO_EXTEND_NONE)
 	limit = *extents;
 
     clone = cairo_image_surface_create (dst->format, limit.width, limit.height);
@@ -653,6 +653,9 @@ _pixman_image_for_recording (cairo_image_surface_t *dst,
 			       &pattern->base.matrix);
 	if (tx | ty)
 	    cairo_matrix_translate (m, tx, ty);
+
+	status = cairo_matrix_invert (m);
+	assert (status == CAIRO_STATUS_SUCCESS);
     } else {
 	/* XXX extract scale factor for repeating patterns */
     }
@@ -673,9 +676,11 @@ _pixman_image_for_recording (cairo_image_surface_t *dst,
 	    pixman_image_unref (pixman_image);
 	    pixman_image= NULL;
 	}
+    } else {
+	*ix = -limit.x;
+	*iy = -limit.y;
     }
 
-
     return pixman_image;
 }