[cairo-commit] 3 commits - test/Makefile.am test/README test/user-font-image.c test/user-font-image-ref.png
Adrian Johnson
ajohnson at kemper.freedesktop.org
Mon Oct 27 05:47:45 PDT 2008
test/Makefile.am | 2
test/README | 2
test/user-font-image-ref.png |binary
test/user-font-image.c | 254 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 257 insertions(+), 1 deletion(-)
New commits:
commit a1a7ec6a056fa36389a48c0f53884ae7e92ebc1a
Author: Adrian Johnson <ajohnson at redneon.com>
Date: Mon Oct 27 23:13:05 2008 +1030
Change ps to ps3 in test/README
The ps target no longer exists.
diff --git a/test/README b/test/README
index 4b1f93d..44a1117 100644
--- a/test/README
+++ b/test/README
@@ -32,7 +32,7 @@ It should contain a (space-, comma-, etc-separated) list of backends to test.
To limit the tests run, use the TESTS make variable, which should be a
space-separated list of tests to run. For example:
- make test TARGETS=image,ps TESTS="zero-alpha"
+ make test TARGETS=image,ps3 TESTS="zero-alpha"
Another very handy mechanism when trying to fix bugs is:
commit 670d942fe3dafbed5ceca234e760f29f793233cb
Author: Adrian Johnson <ajohnson at redneon.com>
Date: Mon Oct 27 23:04:16 2008 +1030
Change user-font-image test to use a pattern
This can be used to expose a bug in _cairo_rectangle_intersect() by
changing:
fixed_scale = 1024 to 1 in cairo-user-font.c
and
cairo_matrix_translate (&matrix, 0, -8) to (&matrix, 0, -9) in
user-font-image.c
This will cause cairo_text_extents (cr, text, &extents) in
user-font-image.c to return a height of 8388683.
diff --git a/test/user-font-image-ref.png b/test/user-font-image-ref.png
index 563172c..e59eab8 100644
Binary files a/test/user-font-image-ref.png and b/test/user-font-image-ref.png differ
diff --git a/test/user-font-image.c b/test/user-font-image.c
index ff73026..2c50339 100644
--- a/test/user-font-image.c
+++ b/test/user-font-image.c
@@ -116,6 +116,8 @@ test_scaled_font_render_glyph (cairo_scaled_font_t *scaled_font,
int i;
unsigned char *data;
cairo_surface_t *image;
+ cairo_pattern_t *pattern;
+ cairo_matrix_t matrix;
uint8_t byte;
/* FIXME: We simply crash on out-of-bound glyph indices */
@@ -130,8 +132,15 @@ test_scaled_font_render_glyph (cairo_scaled_font_t *scaled_font,
data += cairo_image_surface_get_stride (image);
}
- cairo_scale (cr, 1.0/8.0, 1.0/8.0);
- cairo_mask_surface (cr, image, 0, -8);
+ pattern = cairo_pattern_create_for_surface (image);
+ cairo_matrix_init_identity (&matrix);
+ cairo_matrix_scale (&matrix, 1.0/8.0, 1.0/8.0);
+ cairo_matrix_translate (&matrix, 0, -8);
+ cairo_matrix_invert (&matrix);
+ cairo_pattern_set_matrix (pattern, &matrix);
+ cairo_set_source (cr, pattern);
+ cairo_mask (cr, pattern);
+ cairo_pattern_destroy (pattern);
cairo_surface_destroy (image);
return CAIRO_STATUS_SUCCESS;
commit cdacf55e1b16a6982c681fab212405fc4af4f1db
Author: Adrian Johnson <ajohnson at redneon.com>
Date: Mon Oct 27 22:07:04 2008 +1030
Add user-font-image test
Draws bitmap glyphs using cairo_mask(). This test exposes a bug in the
calculation of the glyph extents.
diff --git a/test/Makefile.am b/test/Makefile.am
index 08f66fd..ec151c5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -184,6 +184,7 @@ unantialiased-shapes$(EXEEXT) \
unbounded-operator$(EXEEXT) \
user-data$(EXEEXT) \
user-font$(EXEEXT) \
+user-font-image$(EXEEXT) \
user-font-proxy$(EXEEXT) \
user-font-rescale$(EXEEXT) \
zero-alpha$(EXEEXT)
@@ -936,6 +937,7 @@ REFERENCE_IMAGES = \
user-font-ps3-ref.png \
user-font-svg12-ref.png \
user-font-svg11-ref.png \
+ user-font-image-ref.png \
user-font-proxy-ref.png \
user-font-proxy-pdf-ref.png \
user-font-proxy-ps2-ref.png \
diff --git a/test/user-font-image-ref.png b/test/user-font-image-ref.png
new file mode 100644
index 0000000..563172c
Binary files /dev/null and b/test/user-font-image-ref.png differ
diff --git a/test/user-font-image.c b/test/user-font-image.c
new file mode 100644
index 0000000..ff73026
--- /dev/null
+++ b/test/user-font-image.c
@@ -0,0 +1,245 @@
+/*
+ * Copyright © 2006, 2008 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.
+ *
+ * Contributor(s):
+ * Kristian Høgsberg <krh at redhat.com>
+ * Behdad Esfahbod <behdad at behdad.org>
+ * Adrian Johnson <ajohnson at redneon.com>
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "cairo-test.h"
+
+/*#define ROTATED 1*/
+
+#define BORDER 10
+#define TEXT_SIZE 64
+#define WIDTH (TEXT_SIZE * 15 + 2*BORDER)
+#define HEIGHT ((TEXT_SIZE + 2*BORDER)*2)
+#define TEXT "cairo"
+
+static cairo_test_draw_function_t draw;
+
+static const cairo_test_t test = {
+ "user-font-image",
+ "Tests a user-font using bitmap images",
+#ifndef ROTATED
+ WIDTH, HEIGHT,
+#else
+ WIDTH, WIDTH,
+#endif
+ draw
+};
+
+/* Reverse the bits in a byte with 7 operations (no 64-bit):
+ * Devised by Sean Anderson, July 13, 2001.
+ * Source: http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith32Bits
+ */
+#define CAIRO_BITSWAP8(c) ((((c) * 0x0802LU & 0x22110LU) | ((c) * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16)
+
+#ifdef WORDS_BIGENDIAN
+#define CAIRO_BITSWAP8_IF_LITTLE_ENDIAN(c) (c)
+#else
+#define CAIRO_BITSWAP8_IF_LITTLE_ENDIAN(c) CAIRO_BITSWAP8(c)
+#endif
+
+
+
+/* Simple glyph definition. data is an 8x8 bitmap.
+ */
+typedef struct {
+ unsigned long ucs4;
+ int width;
+ char data[8];
+} test_scaled_font_glyph_t;
+
+static cairo_user_data_key_t test_font_face_glyphs_key;
+
+static cairo_status_t
+test_scaled_font_init (cairo_scaled_font_t *scaled_font,
+ cairo_t *cr,
+ cairo_font_extents_t *metrics)
+{
+ metrics->ascent = 1;
+ metrics->descent = 0;
+ return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+test_scaled_font_unicode_to_glyph (cairo_scaled_font_t *scaled_font,
+ unsigned long unicode,
+ unsigned long *glyph)
+{
+ test_scaled_font_glyph_t *glyphs = cairo_font_face_get_user_data (cairo_scaled_font_get_font_face (scaled_font),
+ &test_font_face_glyphs_key);
+ int i;
+
+ for (i = 0; glyphs[i].ucs4 != (unsigned long) -1; i++)
+ if (glyphs[i].ucs4 == unicode) {
+ *glyph = i;
+ return CAIRO_STATUS_SUCCESS;
+ }
+
+ /* Not found. Default to glyph 0 */
+ return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+test_scaled_font_render_glyph (cairo_scaled_font_t *scaled_font,
+ unsigned long glyph,
+ cairo_t *cr,
+ cairo_text_extents_t *metrics)
+{
+ test_scaled_font_glyph_t *glyphs = cairo_font_face_get_user_data (cairo_scaled_font_get_font_face (scaled_font),
+ &test_font_face_glyphs_key);
+ int i;
+ unsigned char *data;
+ cairo_surface_t *image;
+ uint8_t byte;
+
+ /* FIXME: We simply crash on out-of-bound glyph indices */
+
+ metrics->x_advance = (glyphs[glyph].width + 1) / 8.0;
+
+ image = cairo_image_surface_create (CAIRO_FORMAT_A1, glyphs[glyph].width, 8);
+ data = cairo_image_surface_get_data (image);
+ for (i = 0; i < 8; i++) {
+ byte = glyphs[glyph].data[i];
+ *data = CAIRO_BITSWAP8_IF_LITTLE_ENDIAN (byte);
+ data += cairo_image_surface_get_stride (image);
+ }
+
+ cairo_scale (cr, 1.0/8.0, 1.0/8.0);
+ cairo_mask_surface (cr, image, 0, -8);
+ cairo_surface_destroy (image);
+
+ return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+_user_font_face_create (cairo_font_face_t **out)
+{
+ static const test_scaled_font_glyph_t glyphs [] = {
+ { 'c', 6, { 0x00, 0x38, 0x44, 0x80, 0x80, 0x80, 0x44, 0x38 } },
+ { 'a', 6, { 0x00, 0x70, 0x88, 0x3c, 0x44, 0x84, 0x8c, 0x74 } },
+ { 'i', 1, { 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 } },
+ { 'r', 6, { 0x00, 0xb8, 0xc4, 0x80, 0x80, 0x80, 0x80, 0x80 } },
+ { 'o', 7, { 0x00, 0x38, 0x44, 0x82, 0x82, 0x82, 0x44, 0x38 } },
+ { -1, 8, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+ };
+
+ cairo_font_face_t *user_font_face;
+ cairo_status_t status;
+
+ user_font_face = cairo_user_font_face_create ();
+ cairo_user_font_face_set_init_func (user_font_face, test_scaled_font_init);
+ cairo_user_font_face_set_render_glyph_func (user_font_face, test_scaled_font_render_glyph);
+ cairo_user_font_face_set_unicode_to_glyph_func (user_font_face, test_scaled_font_unicode_to_glyph);
+
+ status = cairo_font_face_set_user_data (user_font_face,
+ &test_font_face_glyphs_key,
+ (void*) glyphs, NULL);
+ if (status) {
+ cairo_font_face_destroy (user_font_face);
+ return status;
+ }
+
+ *out = user_font_face;
+ return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_font_face_t *font_face;
+ const char text[] = TEXT;
+ cairo_font_extents_t font_extents;
+ cairo_text_extents_t extents;
+ cairo_status_t status;
+
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_paint (cr);
+
+#ifdef ROTATED
+ cairo_translate (cr, TEXT_SIZE, 0);
+ cairo_rotate (cr, .6);
+#endif
+
+ status = _user_font_face_create (&font_face);
+ if (status) {
+ return cairo_test_status_from_status (cairo_test_get_context (cr),
+ status);
+ }
+
+ cairo_set_font_face (cr, font_face);
+ cairo_font_face_destroy (font_face);
+
+ cairo_set_font_size (cr, TEXT_SIZE);
+
+ cairo_font_extents (cr, &font_extents);
+ cairo_text_extents (cr, text, &extents);
+
+ /* logical boundaries in red */
+ cairo_move_to (cr, 0, BORDER);
+ cairo_rel_line_to (cr, WIDTH, 0);
+ cairo_move_to (cr, 0, BORDER + font_extents.ascent);
+ cairo_rel_line_to (cr, WIDTH, 0);
+ cairo_move_to (cr, 0, BORDER + font_extents.ascent + font_extents.descent);
+ cairo_rel_line_to (cr, WIDTH, 0);
+ cairo_move_to (cr, BORDER, 0);
+ cairo_rel_line_to (cr, 0, 2*BORDER + TEXT_SIZE);
+ cairo_move_to (cr, BORDER + extents.x_advance, 0);
+ cairo_rel_line_to (cr, 0, 2*BORDER + TEXT_SIZE);
+ cairo_set_source_rgb (cr, 1, 0, 0);
+ cairo_set_line_width (cr, 2);
+ cairo_stroke (cr);
+
+ /* ink boundaries in green */
+ cairo_rectangle (cr,
+ BORDER + extents.x_bearing, BORDER + font_extents.ascent + extents.y_bearing,
+ extents.width, extents.height);
+ cairo_set_source_rgb (cr, 0, 1, 0);
+ cairo_set_line_width (cr, 2);
+ cairo_stroke (cr);
+
+ /* text in black */
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_move_to (cr, BORDER, BORDER + font_extents.ascent);
+ cairo_show_text (cr, text);
+
+
+ /* filled version of text in blue */
+ cairo_set_source_rgb (cr, 0, 0, 1);
+ cairo_move_to (cr, BORDER, BORDER + font_extents.height + 2*BORDER + font_extents.ascent);
+ cairo_text_path (cr, text);
+ cairo_fill (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
More information about the cairo-commit
mailing list