[cairo-commit] 3 commits - test/font-matrix-translation.c test/font-matrix-translation-ref.png test/ft-text-vertical-layout-pdf-argb32-ref.png test/ft-text-vertical-layout-svg-rgb24-ref.png test/.gitignore test/Makefile.am test/pixman-rotate-svg-argb32-ref.png test/pixman-rotate-svg-rgb24-ref.png

Carl Worth cworth at kemper.freedesktop.org
Fri Jul 14 14:46:15 PDT 2006


 dev/null                                        |binary
 test/.gitignore                                 |    1 
 test/Makefile.am                                |    1 
 test/font-matrix-translation-ref.png            |binary
 test/font-matrix-translation.c                  |  113 ++++++++++++++++++++++++
 test/ft-text-vertical-layout-pdf-argb32-ref.png |binary
 test/ft-text-vertical-layout-svg-rgb24-ref.png  |binary
 test/pixman-rotate-svg-argb32-ref.png           |    0 
 test/pixman-rotate-svg-rgb24-ref.png            |    0 
 9 files changed, 115 insertions(+)

New commits:
diff-tree c70edff0842bc6f7238e17a5fe92dddceec283d3 (from b390e2c45632a4974b85a6a5ea414e249adb62a3)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Jul 14 12:45:48 2006 -0700

    Add font-matrix-translation test case.

diff --git a/test/.gitignore b/test/.gitignore
index 1b6b64e..0f56121 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -46,6 +46,7 @@ ft-font-create-for-ft-face
 ft-text-vertical-layout
 ft-text-antialias-none
 font-face-get-type
+font-matrix-translation
 get-and-set
 get-group-target
 glyph-cache-pressure
diff --git a/test/Makefile.am b/test/Makefile.am
index 97ac10d..5086ffe 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,6 +31,7 @@ fill-and-stroke-alpha-add	\
 fill-rule			\
 filter-nearest-offset		\
 font-face-get-type		\
+font-matrix-translation		\
 glyph-cache-pressure		\
 get-and-set			\
 get-group-target		\
diff --git a/test/font-matrix-translation-ref.png b/test/font-matrix-translation-ref.png
new file mode 100644
index 0000000..a7aeb59
Binary files /dev/null and b/test/font-matrix-translation-ref.png differ
diff --git a/test/font-matrix-translation.c b/test/font-matrix-translation.c
new file mode 100644
index 0000000..dbdeb87
--- /dev/null
+++ b/test/font-matrix-translation.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
+ *
+ * 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: Carl D. Worth <cworth at cworth.org>
+ */
+
+#include "cairo-test.h"
+
+#define TEXT_SIZE 12
+#define PAD 4
+#define TEXT "text"
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "font-matrix-translation",
+    "Test that translation in a font matrix can be used to offset a string",
+    38, 34,
+    draw
+};
+
+static void
+box_text (cairo_t *cr, const char *utf8, double x, double y)
+{
+    double line_width;
+    cairo_text_extents_t extents;
+
+    cairo_save (cr);
+
+    cairo_text_extents (cr, utf8, &extents);
+    line_width = cairo_get_line_width (cr);
+    cairo_rectangle (cr,
+		     x + extents.x_bearing - line_width / 2,
+		     y + extents.y_bearing - line_width / 2,
+		     extents.width  + line_width,
+		     extents.height + line_width);
+    cairo_stroke (cr);
+
+    cairo_move_to (cr, x, y);
+    cairo_show_text (cr, utf8);
+
+    cairo_restore (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_font_options_t *font_options;
+    cairo_text_extents_t extents;
+    cairo_matrix_t matrix;
+
+    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
+    cairo_paint (cr);
+
+    cairo_select_font_face (cr, "Bitstream Vera Sans",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size (cr, TEXT_SIZE);
+
+    font_options = cairo_font_options_create ();
+
+    cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
+    cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY);
+
+    cairo_set_font_options (cr, font_options);
+    cairo_font_options_destroy (font_options);
+
+    cairo_translate (cr, PAD, PAD);
+    cairo_set_line_width (cr, 1.0);
+
+    cairo_text_extents (cr, TEXT, &extents);
+
+    /* Draw text and bounding box */
+    cairo_set_source_rgb (cr, 0, 0, 0); /* black */
+    box_text (cr, TEXT, 0, - extents.y_bearing);
+
+    /* Then draw again with the same coordinates, but with a font
+     * matrix to position the text below and shifted a bit to the
+     * right. */
+    cairo_matrix_init_translate (&matrix, TEXT_SIZE / 2, TEXT_SIZE + PAD);
+    cairo_matrix_scale (&matrix, TEXT_SIZE, TEXT_SIZE);
+    cairo_set_font_matrix (cr, &matrix);
+
+    cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
+    box_text (cr, TEXT, 0, - extents.y_bearing);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}
diff-tree b390e2c45632a4974b85a6a5ea414e249adb62a3 (from 2b30f85cade33653afddf536aa7e775dd360f501)
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Jul 13 16:01:57 2006 -0700

    pixman-rotate: remove stale svg backend reference images

diff --git a/test/pixman-rotate-svg-argb32-ref.png b/test/pixman-rotate-svg-argb32-ref.png
deleted file mode 100644
index 08d750b..0000000
Binary files a/test/pixman-rotate-svg-argb32-ref.png and /dev/null differ
diff --git a/test/pixman-rotate-svg-rgb24-ref.png b/test/pixman-rotate-svg-rgb24-ref.png
deleted file mode 100644
index 349fd5c..0000000
Binary files a/test/pixman-rotate-svg-rgb24-ref.png and /dev/null differ
diff-tree 2b30f85cade33653afddf536aa7e775dd360f501 (from 5d64efdbb8fc4e17d4fa44d21068870cd2aea7ce)
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Jul 13 15:56:12 2006 -0700

    ft-text-vertical-layout: Update stale reference images

diff --git a/test/ft-text-vertical-layout-pdf-argb32-ref.png b/test/ft-text-vertical-layout-pdf-argb32-ref.png
index 80fbcab..dcc3d8b 100644
Binary files a/test/ft-text-vertical-layout-pdf-argb32-ref.png and b/test/ft-text-vertical-layout-pdf-argb32-ref.png differ
diff --git a/test/ft-text-vertical-layout-svg-rgb24-ref.png b/test/ft-text-vertical-layout-svg-rgb24-ref.png
index d36f5e5..91bfc1d 100644
Binary files a/test/ft-text-vertical-layout-svg-rgb24-ref.png and b/test/ft-text-vertical-layout-svg-rgb24-ref.png differ


More information about the cairo-commit mailing list