[cairo-commit] 2 commits - src/cairo-pdf-surface.c test/Makefile.sources test/pdf-isolated-group.c test/reference

[Adrian Johnson]

 src/cairo-pdf-surface.c                   |    4 +
 test/Makefile.sources                     |    1 
 test/pdf-isolated-group.c                 |   73 ++++++++++++++++++++++++++++++
 test/reference/pdf-isolated-group.ref.png |binary
 4 files changed, 78 insertions(+)

New commits:
commit 2d3a1c7318df67347f65b0098cb9ea091ed93b3a
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Feb 25 16:56:08 2012 +1030

    pdf: ensure all transparency groups are isolated

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index 406ddbc..b758d00 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1724,6 +1724,7 @@ _cairo_pdf_surface_write_memory_stream (cairo_pdf_surface_t         *surface,
 				 "   /Group <<\n"
 				 "      /Type /Group\n"
 				 "      /S /Transparency\n"
+				 "      /I true\n"
 				 "      /CS /DeviceRGB\n",
 				 bbox->p1.x, bbox->p1.y, bbox->p2.x, bbox->p2.y);
 
@@ -1872,6 +1873,7 @@ _cairo_pdf_surface_open_content_stream (cairo_pdf_surface_t       *surface,
 					    "   /Group <<\n"
 					    "      /Type /Group\n"
 					    "      /S /Transparency\n"
+					    "      /I true\n"
 					    "      /CS /DeviceRGB\n"
 					    "   >>\n"
 					    "   /Resources %d 0 R\n",
@@ -3440,6 +3442,7 @@ cairo_pdf_surface_emit_transparency_group (cairo_pdf_surface_t  *surface,
 					     "   /Group\n"
 					     "      << /Type /Group\n"
 					     "         /S /Transparency\n"
+					     "         /I true\n"
 					     "         /CS /DeviceGray\n"
 					     "      >>\n",
 					     surface->width,
@@ -6044,6 +6047,7 @@ _cairo_pdf_surface_write_page (cairo_pdf_surface_t *surface)
 				 "   /Group <<\n"
 				 "      /Type /Group\n"
 				 "      /S /Transparency\n"
+				 "      /I true\n"
 				 "      /CS /DeviceRGB\n"
 				 "   >>\n"
 				 "   /Resources %d 0 R\n"
commit 2de75b1a3453f734feeb67de1c09d70d640c7b24
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Feb 25 16:53:26 2012 +1030

    test: add test to check that pdf transparency groups are non-isolated

diff --git a/test/Makefile.sources b/test/Makefile.sources
index 6079ce3..b560d91 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -238,6 +238,7 @@ test_sources = \
 	path-precision.c				\
 	pattern-get-type.c				\
 	pattern-getters.c				\
+	pdf-isolated-group.c				\
 	pixman-rotate.c					\
 	png.c						\
 	push-group.c					\
diff --git a/test/pdf-isolated-group.c b/test/pdf-isolated-group.c
new file mode 100644
index 0000000..e74a346
--- /dev/null
+++ b/test/pdf-isolated-group.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2012 Adrian Johnson
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Adrian Johnson <ajohnson at redneon.com>
+ */
+
+#include "cairo-test.h"
+
+#define SIZE 60
+#define WIDTH  SIZE
+#define HEIGHT SIZE
+
+
+/* PDF transparency groups can be isolated or non-isolated. This test
+ * checks that the PDF output is using isolated groups. If the group
+ * is non-isolated the bottom half of the inner rectangle will be
+ * red. Note poppler-cairo currently ignores the isolated flag and
+ * treats the group as isolated.
+ *
+ * Refer to http://www.pdfvt.com/PDFVT_TransparencyGuide.html for an
+ * explanation isolated vs non-isolated.
+ */
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_set_source_rgb (cr, 1, 0.5, 0);
+    cairo_rectangle (cr, 0, SIZE/2, SIZE, SIZE/2);
+    cairo_fill (cr);
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_MULTIPLY);
+
+    cairo_push_group (cr);
+
+    cairo_set_source_rgb (cr, 0.7, 0.7, 0.7);
+    cairo_rectangle (cr, SIZE/4, SIZE/4, SIZE/2, SIZE/2);
+    cairo_fill (cr);
+
+    cairo_pop_group_to_source (cr);
+    cairo_paint (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (pdf_isolated_group,
+	    "Check that transparency groups in PDF output are isolated",
+	    "group, operator", /* keywords */
+	    NULL, /* requirements */
+	    WIDTH, HEIGHT,
+	    NULL, draw)
diff --git a/test/reference/pdf-isolated-group.ref.png b/test/reference/pdf-isolated-group.ref.png
new file mode 100644
index 0000000..6c8522c
Binary files /dev/null and b/test/reference/pdf-isolated-group.ref.png differ