test: Add show-glyphs-advance

This new test (based on show-glyphs-many) checks that the glyphs
advances are respected along both axes.

9c0d761bfcdd28d52c83d74f46dd3c709ae0fa69 introduced a bug which
regresses this test in quartz.

Thanks to Jeff Muizelaar for the report!

8 files changed, 113 insertions, 0 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 8a62c136..a49ec629 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1197,6 +1197,11 @@ REFERENCE_IMAGES = \
 	self-intersecting.xlib.ref.png \
 	set-source.ref.png \
 	set-source.rgb24.ref.png \
+	show-glyphs-advance.image16.ref.png \
+	show-glyphs-advance.ps.ref.png \
+	show-glyphs-advance.quartz.ref.png \
+	show-glyphs-advance.ref.png \
+	show-glyphs-advance.svg.ref.png \
 	show-glyphs-many.ref.png \
 	show-text-current-point.image16.ref.png \
 	show-text-current-point.ps2.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index e88c85cc..588d1450 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -241,6 +241,7 @@ test_sources = \
 	self-copy-overlap.c				\
 	self-intersecting.c				\
 	set-source.c					\
+	show-glyphs-advance.c				\
 	show-glyphs-many.c				\
 	show-text-current-point.c			\
 	skew-extreme.c					\
diff --git a/test/show-glyphs-advance.c b/test/show-glyphs-advance.c
new file mode 100644
index 00000000..5fe9ec83
--- /dev/null
+++ b/test/show-glyphs-advance.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
+ * Copyright © 2011 Andrea Canciani
+ *
+ * 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: Carl D. Worth <cworth@cworth.org>
+ *         Andrea Canciani <ranma42@gmail.com>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_status_t
+get_glyph (const cairo_test_context_t *ctx,
+	   cairo_scaled_font_t *scaled_font,
+	   const char *utf8,
+	   cairo_glyph_t *glyph)
+{
+    cairo_glyph_t *text_to_glyphs;
+    cairo_status_t status;
+    int i;
+
+    text_to_glyphs = glyph;
+    i = 1;
+    status = cairo_scaled_font_text_to_glyphs (scaled_font,
+					       0, 0,
+					       utf8, -1,
+					       &text_to_glyphs, &i,
+					       NULL, NULL,
+					       0);
+    if (status != CAIRO_STATUS_SUCCESS)
+	return cairo_test_status_from_status (ctx, status);
+
+    if (text_to_glyphs != glyph) {
+	*glyph = text_to_glyphs[0];
+	cairo_glyph_free (text_to_glyphs);
+    }
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+static const char *characters[] = { "A", "B", "C", "D" };
+
+#define NUM_CHARS ARRAY_LENGTH (characters)
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    const cairo_test_context_t *ctx = cairo_test_get_context (cr);
+    cairo_scaled_font_t *scaled_font;
+    cairo_glyph_t *glyphs = xmalloc (NUM_CHARS  * sizeof (cairo_glyph_t));
+    int i;
+    cairo_status_t status;
+
+    /* Paint white background. */
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    scaled_font = cairo_get_scaled_font (cr);
+
+    for (i = 0; i < NUM_CHARS; i++) {
+	status = get_glyph (ctx, scaled_font, characters[i], &glyphs[i]);
+	if (status)
+	    goto BAIL;
+
+	glyphs[i].x = 10.0 + 10.0 * (i % 2);
+	glyphs[i].y = 20.0 + 10.0 * (i / 2);
+    }
+
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_show_glyphs (cr, glyphs, 4);
+
+    cairo_translate (cr, 40., 20.);
+    cairo_rotate (cr, M_PI / 4.);
+
+    cairo_show_glyphs (cr, glyphs, NUM_CHARS);
+
+  BAIL:
+    free(glyphs);
+
+    return status;
+}
+
+CAIRO_TEST (show_glyphs_advance,
+	    "Test that glyph advances work as expected along both axes",
+	    "text, matrix", /* keywords */
+	    NULL, /* requirements */
+	    64, 64,
+	    NULL, draw)
diff --git a/test/show-glyphs-advance.image16.ref.png b/test/show-glyphs-advance.image16.ref.png
new file mode 100644
index 00000000..dd2f18d0
--- /dev/null
+++ b/test/show-glyphs-advance.image16.ref.png
diff --git a/test/show-glyphs-advance.ps.ref.png b/test/show-glyphs-advance.ps.ref.png
new file mode 100644
index 00000000..96a80f9b
--- /dev/null
+++ b/test/show-glyphs-advance.ps.ref.png
diff --git a/test/show-glyphs-advance.quartz.ref.png b/test/show-glyphs-advance.quartz.ref.png
new file mode 100644
index 00000000..4750308f
--- /dev/null
+++ b/test/show-glyphs-advance.quartz.ref.png
diff --git a/test/show-glyphs-advance.ref.png b/test/show-glyphs-advance.ref.png
new file mode 100644
index 00000000..bf44a8f9
--- /dev/null
+++ b/test/show-glyphs-advance.ref.png
diff --git a/test/show-glyphs-advance.svg.ref.png b/test/show-glyphs-advance.svg.ref.png
new file mode 100644
index 00000000..914d4d69
--- /dev/null
+++ b/test/show-glyphs-advance.svg.ref.png