[cairo-commit] cairo/src cairo-features.h.in, 1.11, 1.12 cairo.h, 1.65, 1.66 cairoint.h, 1.82, 1.83

[Kristian Hogsberg]

Committed by: krh

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv3513/src

Modified Files:
	cairo-features.h.in cairo.h cairoint.h 
Log Message:
2005-01-17  Kristian Høgsberg  <krh at redhat.com>

        * test/Makefile.am (EXTRA_DIST): Take image_rotate-ref.png out of
        EXTRA_DIST until we can actually render it correctly.
        (XFAIL_TESTS): Update with new known bugs.

        * src/cairo-features.h.in:
        * src/cairo.h:
        * src/cairoint.h:
        * configure.in: Add font backend selection options.



Index: cairo-features.h.in
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-features.h.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cairo-features.h.in	5 Jan 2005 22:29:31 -0000	1.11
+++ cairo-features.h.in	17 Jan 2005 17:18:37 -0000	1.12
@@ -49,6 +49,10 @@
 
 #define @GLITZ_SURFACE_FEATURE@
 
+#define @FREETYPE_FONT_FEATURE@
+
+#define @ATSUI_FONT_FEATURE@
+
 #define @SANITY_CHECKING_FEATURE@
 
 #endif

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- cairo.h	16 Jan 2005 16:35:14 -0000	1.65
+++ cairo.h	17 Jan 2005 17:18:37 -0000	1.66
@@ -523,7 +523,7 @@
 cairo_font_current_transform (cairo_font_t *font, 
 			      cairo_matrix_t *matrix);
 
-#if CAIRO_HAS_FT_FONT
+#ifdef CAIRO_HAS_FREETYPE_FONT
 /* Fontconfig/Freetype platform-specific font interface */
 
 #include <fontconfig/fontconfig.h>
@@ -542,7 +542,7 @@
 FcPattern *
 cairo_ft_font_pattern (cairo_font_t  *ft_font);
 
-#endif  /* CAIRO_HAS_FT_FONT */
+#endif  /* CAIRO_HAS_FREETYPE_FONT */
 
 /* Image functions */
 

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- cairoint.h	16 Jan 2005 16:35:14 -0000	1.82
+++ cairoint.h	17 Jan 2005 17:18:37 -0000	1.83
@@ -500,11 +500,13 @@
 } cairo_font_backend_t;
 
 /* concrete font backends */
-#ifdef CAIRO_HAS_FT_FONT
+#ifdef CAIRO_HAS_FREETYPE_FONT
 
 extern const cairo_private struct _cairo_font_backend cairo_ft_font_backend;
 
-#elif defined(CAIRO_HAS_ATSUI_FONT)
+#endif
+
+#ifdef CAIRO_HAS_ATSUI_FONT
 
 extern const cairo_private struct _cairo_font_backend cairo_atsui_font_backend;
 
@@ -743,7 +745,7 @@
 #define CAIRO_FONT_SLANT_DEFAULT   CAIRO_FONT_SLANT_NORMAL
 #define CAIRO_FONT_WEIGHT_DEFAULT  CAIRO_FONT_WEIGHT_NORMAL
 
-#ifdef CAIRO_HAS_FT_FONT
+#ifdef CAIRO_HAS_FREETYPE_FONT 
 
 #define CAIRO_FONT_FAMILY_DEFAULT  "serif"