[cairo-commit] cairo/test .cvsignore, 1.42, 1.43 Makefile.am, 1.78, 1.79 ft-font-create-for-ft-face.c, NONE, 1.1

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv23467/test

Modified Files:
	.cvsignore Makefile.am 
Added Files:
	ft-font-create-for-ft-face.c 
Log Message:

2005-08-17  Carl Worth  <cworth at cworth.org>

        Fixes for bug #4110:

        * src/cairo-ft-font.c (_cairo_ft_unscaled_font_init): Don't call
        _cairo_ft_unscaled_font_init_key in the from_face case, just clear
        filename and id instead. Initialize unscaled->base first so that
        initialization order matches the structure declaration order.

        * src/cairo-cache.c (_cairo_hash_string): Fix to accept a NULL
        string and hash it identically to a zero-length string.

        * test/Makefile.am:
        * test/ft-font-create-for-ft-face: Add a test that calls
        cairo_ft_font_create_for_ft_face to demonstrate bug #4110.


Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo/test/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- .cvsignore	9 Aug 2005 19:35:09 -0000	1.42
+++ .cvsignore	17 Aug 2005 16:51:09 -0000	1.43
@@ -15,6 +15,7 @@
 fill-and-stroke
 fill-rule
 filter-nearest-offset
+ft-font-create-for-ft-face
 get-and-set
 gradient-alpha
 imagediff

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Makefile.am	13 Aug 2005 10:26:18 -0000	1.78
+++ Makefile.am	17 Aug 2005 16:51:09 -0000	1.79
@@ -47,6 +47,10 @@
 user-data			\
 rel-path
 
+if CAIRO_HAS_FT_FONT
+TESTS += ft-font-create-for-ft-face
+endif
+
 if CAIRO_HAS_PDF_SURFACE
 TESTS += pdf-surface pdf-clip
 endif
@@ -174,6 +178,7 @@
 fill_and_stroke_LDADD = $(LDADDS)
 fill_rule_LDADD = $(LDADDS)
 filter_nearest_offset_LDADD = $(LDADDS)
+ft_font_create_for_ft_face_LDADD = $(LDADDS)
 get_and_set_LDADD = $(LDADDS)
 gradient_alpha_LDADD = $(LDADDS)
 leaky_polygon_LDADD = $(LDADDS)

--- NEW FILE: ft-font-create-for-ft-face.c ---
(This appears to be a binary file; contents omitted.)