[cairo-commit] 2 commits - src/cairo-pdf-operators.c test/Makefile.sources test/reference test/rotate-stroke-box.c

[Adrian Johnson]

 src/cairo-pdf-operators.c                |    4 +-
 test/Makefile.sources                    |    1 
 test/reference/rotate-stroke-box.ref.png |binary
 test/rotate-stroke-box.c                 |   51 +++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit 5cafaa7b3bc045a7a26a11986c16fd9419a09922
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Dec 26 15:28:29 2013 +1030

    pdf: fix rectangle stroke with non rectilinear pen

diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c
index 84d2441..c2f6bcf 100644
--- a/src/cairo-pdf-operators.c
+++ b/src/cairo-pdf-operators.c
@@ -510,7 +510,9 @@ _cairo_pdf_operators_emit_path (cairo_pdf_operators_t	*pdf_operators,
     info.output = word_wrap;
     info.path_transform = path_transform;
     info.line_cap = line_cap;
-    if (_cairo_path_fixed_is_rectangle (path, &box)) {
+    if (_cairo_path_fixed_is_rectangle (path, &box) &&
+	((path_transform->xx == 0 && path_transform->yy == 0) ||
+	 (path_transform->xy == 0 && path_transform->yx == 0))) {
 	status = _cairo_pdf_path_rectangle (&info, &box);
     } else {
 	status = _cairo_path_fixed_interpret (path,
commit acd78d721e9d1c9c74c88889fbc4580700962ed1
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Dec 26 15:27:30 2013 +1030

    Add test for rectangle path optimization with non rectilinear pen
    
    This fails on pdf/ps.

diff --git a/test/Makefile.sources b/test/Makefile.sources
index 9fbfb96..5319ee4 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -283,6 +283,7 @@ test_sources = \
 	rel-path.c					\
 	rgb24-ignore-alpha.c				\
 	rotate-image-surface-paint.c			\
+	rotate-stroke-box.c                             \
 	rotated-clip.c					\
 	rounded-rectangle-fill.c			\
 	rounded-rectangle-stroke.c			\
diff --git a/test/reference/rotate-stroke-box.ref.png b/test/reference/rotate-stroke-box.ref.png
new file mode 100644
index 0000000..ef155f0
Binary files /dev/null and b/test/reference/rotate-stroke-box.ref.png differ
diff --git a/test/rotate-stroke-box.c b/test/rotate-stroke-box.c
new file mode 100644
index 0000000..ebbd795
--- /dev/null
+++ b/test/rotate-stroke-box.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2013 Adrian Johnson
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Adrian Johnson <ajohnson at redneon.com>
+ */
+
+#include "cairo-test.h"
+#include <math.h>
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_path_t *path;
+
+    cairo_save (cr);
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+    cairo_restore (cr);
+
+    cairo_rectangle (cr, 5, 5, 20, 20);
+    cairo_rotate (cr, M_PI/4);
+    cairo_stroke (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (rotate_stroke_box,
+	    "Ensure rectangle path optimization works when the stroking transform is non rectilinear",
+	    "path", /* keywords */
+	    NULL, /* requirements */
+	    30, 30,
+	    NULL, draw)