[cairo-commit] cairo/test clip-operator-ref.png, 1.4, 1.5 operator-clear-ref.png, 1.2, 1.3 operator-source-ref.png, 1.2, 1.3 text-antialias-gray-ref.png, 1.2, 1.3 text-antialias-gray.c, 1.2, 1.3 text-antialias-none-ref.png, 1.2, 1.3 text-antialias-none.c, 1.3, 1.4 text-antialias-subpixel-ref.png, 1.3, 1.4 text-antialias-subpixel.c, 1.3, 1.4 unbounded-operator-ref.png, 1.3, 1.4

[Keith Packard]

Committed by: keithp

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

Modified Files:
	clip-operator-ref.png operator-clear-ref.png 
	operator-source-ref.png text-antialias-gray-ref.png 
	text-antialias-gray.c text-antialias-none-ref.png 
	text-antialias-none.c text-antialias-subpixel-ref.png 
	text-antialias-subpixel.c unbounded-operator-ref.png 
Log Message:
2005-08-31  Keith Packard  <keithp at keithp.com>

	Reviewed by: otaylor, cworth
	* src/Makefile.am:
	Split out scaled font code to cairo-scaled-font.c
	
	* src/cairo-cache-private.h:
	* src/cairo-cache.c: (_cairo_cache_init), (_cairo_cache_fini),
	(_cairo_cache_create), (_cairo_cache_destroy),
	(_cairo_cache_preserve), (_cairo_cache_release),
	(_cairo_cache_lookup), (_cairo_cache_remove_random),
	(_cairo_cache_insert), (_cairo_cache_remove),
	(_cairo_cache_foreach):
	Replace cairo cache implementation (this code from cworth)

	* src/cairo-debug.c: (cairo_debug_reset_static_data):
	* src/cairo-font.c: (_cairo_font_reset_static_data):
	No more global glyph cache to clean up
	
	* src/cairo-ft-font.c: (_get_bitmap_surface),
	(_render_glyph_outline), (_render_glyph_bitmap),
	(_transform_glyph_bitmap), (_get_pattern_ft_options),
	(_cairo_ft_scaled_font_create), (_cairo_ft_scaled_font_create_toy),
	(_decompose_glyph_outline), (_cairo_ft_scaled_glyph_init),
	(_cairo_ft_ucs4_to_index), (_cairo_ft_show_glyphs),
	(_cairo_ft_font_face_scaled_font_create),
	(_cairo_ft_font_face_create),
	(cairo_ft_font_face_create_for_pattern),
	(cairo_ft_font_face_create_for_ft_face):
	Store glyphs in new per-scaled font caches which
	hold user-space metrics and device space bounding boxes

	* src/cairo-gstate.c: (_cairo_gstate_text_to_glyphs),
	(_cairo_gstate_show_glyphs_draw_func), (_cairo_gstate_show_glyphs):
	Refactor glyph drawing APIs so that the surface API is
	invoked directly from the gstate code.

	* src/cairo-path.c: (_cairo_path_fixed_create),
	(_cairo_path_fixed_destroy):
	Add path creation/destruction routines (to hold glyph paths)
	
	* src/cairo-scaled-font.c: (_cairo_scaled_glyph_keys_equal),
	(_cairo_scaled_glyph_fini), (_cairo_scaled_glyph_destroy),
	(_cairo_scaled_font_set_error), (cairo_scaled_font_status),
	(_cairo_scaled_font_map_lock), (_cairo_scaled_font_map_unlock),
	(_cairo_scaled_font_map_destroy), (_hash_bytes_fnv),
	(_cairo_scaled_font_init_key), (_cairo_scaled_font_keys_equal),
	(_cairo_scaled_font_init), (_cairo_scaled_font_set_metrics),
	(_cairo_scaled_font_fini), (cairo_scaled_font_create),
	(cairo_scaled_font_reference), (cairo_scaled_font_destroy),
	(cairo_scaled_font_extents), (cairo_scaled_font_glyph_extents),
	(_cairo_scaled_font_text_to_glyphs),
	(_cairo_scaled_font_glyph_device_extents),
	(_cairo_scaled_font_show_glyphs), (_scaled_glyph_path_move_to),
	(_scaled_glyph_path_line_to), (_scaled_glyph_path_curve_to),
	(_scaled_glyph_path_close_path), (_cairo_scaled_font_glyph_path),
	(_cairo_scaled_glyph_set_metrics),
	(_cairo_scaled_glyph_set_surface), (_cairo_scaled_glyph_set_path),
	(_cairo_scaled_glyph_lookup):
	New implementation of scaled fonts which uses per-scaled_font
	caches for glyphs and keeps user-space metrics, device-space bboxes
	along with glyph images and/or glyph paths.
	
	* src/cairo-xlib-surface.c:
	(_cairo_xlib_surface_create_similar_with_format),
	(_cairo_xlib_surface_create_similar), (_cairo_xlib_surface_finish),
	(_cairo_xlib_surface_clone_similar),
	(_cairo_xlib_surface_font_init),
	(_cairo_xlib_surface_scaled_font_fini),
	(_cairo_xlib_surface_scaled_glyph_fini),
	(_cairo_xlib_surface_add_glyph),
	(_cairo_xlib_surface_show_glyphs8),
	(_cairo_xlib_surface_show_glyphs16),
	(_cairo_xlib_surface_show_glyphs32),
	(_cairo_xlib_surface_show_glyphs):
	Adapt to new scaled font API changes.

	* src/cairoint.h:
	New cache and scaled_font APIs

	* test/clip-operator-ref.png:
	* test/operator-clear-ref.png:
	* test/operator-source-ref.png:
	* test/text-antialias-gray-ref.png:
	* test/text-antialias-gray.c:
	* test/text-antialias-none-ref.png:
	* test/text-antialias-none.c:
	* test/text-antialias-subpixel-ref.png:
	* test/text-antialias-subpixel.c:
	* test/unbounded-operator-ref.png:
	Repond to bug fix in metrics computation for glyphs
	where y values were rounded up instead of down
	because of a sign difference between cairo and FreeType.


Index: clip-operator-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/clip-operator-ref.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvslcNDLg and /tmp/cvsbv8wM0 differ

Index: operator-clear-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/operator-clear-ref.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs6JXGNf and /tmp/cvsB7HERZ differ

Index: operator-source-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/operator-source-ref.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs9Y8Ubj and /tmp/cvslIPGi3 differ

Index: text-antialias-gray-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-gray-ref.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsgWMP3j and /tmp/cvsXITwc4 differ

Index: text-antialias-gray.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-gray.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- text-antialias-gray.c	23 Aug 2005 20:34:15 -0000	1.2
+++ text-antialias-gray.c	31 Aug 2005 22:08:05 -0000	1.3
@@ -26,7 +26,7 @@
 #include "cairo-test.h"
 
 #define WIDTH  31
-#define HEIGHT 20
+#define HEIGHT 22
 #define TEXT_SIZE 12
 
 cairo_test_t test = {

Index: text-antialias-none-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-none-ref.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs6Fdbwl and /tmp/cvs9msxI5 differ

Index: text-antialias-none.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-none.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- text-antialias-none.c	23 Aug 2005 20:34:15 -0000	1.3
+++ text-antialias-none.c	31 Aug 2005 22:08:05 -0000	1.4
@@ -26,7 +26,7 @@
 #include "cairo-test.h"
 
 #define WIDTH  31
-#define HEIGHT 20
+#define HEIGHT 22
 #define TEXT_SIZE 12
 
 cairo_test_t test = {

Index: text-antialias-subpixel-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-subpixel-ref.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs2U3Nzk and /tmp/cvsV7lUP4 differ

Index: text-antialias-subpixel.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-subpixel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- text-antialias-subpixel.c	23 Aug 2005 20:34:15 -0000	1.3
+++ text-antialias-subpixel.c	31 Aug 2005 22:08:05 -0000	1.4
@@ -26,7 +26,7 @@
 #include "cairo-test.h"
 
 #define WIDTH  31
-#define HEIGHT 20
+#define HEIGHT 22
 #define TEXT_SIZE 12
 
 cairo_test_t test = {

Index: unbounded-operator-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/unbounded-operator-ref.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsiCjcno and /tmp/cvs1Gm3G8 differ