[cairo-commit] cairo/src Makefile.am, 1.31, 1.32 cairo-atsui.h, NONE, 1.1 cairo-features.h.in, 1.13, 1.14 cairo-quartz.h, 1.1, 1.2 cairo_atsui_font.c, 1.1, 1.2 cairo_quartz_surface.c, 1.1, 1.2

[Carl Worth]

Committed by: cworth

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

Modified Files:
	Makefile.am cairo-features.h.in cairo-quartz.h 
	cairo_atsui_font.c cairo_quartz_surface.c 
Added Files:
	cairo-atsui.h 
Log Message:

        * src/cairo-atsui.h: Created new public header cairo-atsui.h.

        Build fixes for Quartz backend courtesy of
        Geoff Norton <gnorton at customerdna.com>:

        * configure.in: Fix check for atsui font backend.

        * src/Makefile.am: Add conditional compilation for
        cairo_atsui_font.c and cairo_ft_font.c.

        * src/cairo_quartz_surface.c: Add missing include of
        cairo-quartz.h.

        * src/cairo-quartz.h: Add include of Carbon/Carbon.h.

        * src/cairo-features.h.in: Advertise availability of Quartz
        surface.

        * src/Makefile.am: Install cairo-quartz.h, and conditionally
        compile cairo_quartz_surface.c.

        * configure.in: Add autofoo checks to detect quartz
        backend.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	20 Jan 2005 16:28:54 -0000	1.31
+++ Makefile.am	21 Jan 2005 04:36:25 -0000	1.32
@@ -1,12 +1,14 @@
 cairoincludedir = $(includedir)/cairo
 cairoinclude_HEADERS =	\
 	cairo.h		\
+	cairo-atsui.h	\
 	cairo-features.h\
 	cairo-ft.h	\
 	cairo-glitz.h	\
 	cairo-pdf.h	\
 	cairo-png.h	\
 	cairo-ps.h	\
+	cairo-quartz.h	\
 	cairo-xcb.h	\
 	cairo-xlib.h
 
@@ -28,6 +30,10 @@
 libcairo_xlib_sources = cairo_xlib_surface.c cairo-xlib.h
 endif
 
+if CAIRO_HAS_QUARTZ_SURFACE
+libcairo_quartz_sources = cairo_quartz_surface.c cairo-quartz.h
+endif
+
 if CAIRO_HAS_XCB_SURFACE
 libcairo_xcb_sources = cairo_xcb_surface.c cairo-xcb.h
 endif
@@ -36,6 +42,14 @@
 libcairo_glitz_sources = cairo_glitz_surface.c cairo-glitz.h
 endif
 
+if CAIRO_HAS_ATSUI_FONT
+libcairo_atsui_sources = cairo_atsui_font.c cairo-atsui.h
+endif
+
+if CAIRO_HAS_FT_FONT
+libcairo_ft_sources = cairo_ft_font.c cairo-ft.h
+endif
+
 # These names match automake style variable definition conventions so
 # without these lines, automake will complain during the handling of 
 # the libcairo_la_LIBADD below.  (The INCLUDES is an autoconf only
@@ -51,7 +65,6 @@
 	cairo_color.c		\
 	cairo_fixed.c		\
 	cairo_font.c		\
-	cairo_ft_font.c		\
 	cairo_gstate.c		\
 	cairo_hull.c		\
 	cairo_image_surface.c	\
@@ -69,10 +82,13 @@
 	cairo_pattern.c		\
 	cairo_wideint.c		\
 	cairo-wideint.h		\
+	$(libcairo_atsui_sources)\
+	$(libcairo_ft_sources)\
 	$(libcairo_ps_sources)  \
 	$(libcairo_pdf_sources) \
 	$(libcairo_png_sources) \
 	$(libcairo_xlib_sources)\
+	$(libcairo_quartz_sources)\
 	$(libcairo_xcb_sources) \
 	$(libcairo_glitz_sources)\
 	cairoint.h

--- NEW FILE: cairo-atsui.h ---
(This appears to be a binary file; contents omitted.)

Index: cairo-features.h.in
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-features.h.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cairo-features.h.in	20 Jan 2005 16:28:54 -0000	1.13
+++ cairo-features.h.in	21 Jan 2005 04:36:25 -0000	1.14
@@ -45,6 +45,8 @@
 
 #define @XLIB_SURFACE_FEATURE@
 
+#define @QUARTZ_SURFACE_FEATURE@
+
 #define @XCB_SURFACE_FEATURE@
 
 #define @GLITZ_SURFACE_FEATURE@

Index: cairo-quartz.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-quartz.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo-quartz.h	20 Jan 2005 16:28:54 -0000	1.1
+++ cairo-quartz.h	21 Jan 2005 04:36:25 -0000	1.2
@@ -40,6 +40,8 @@
 #define CAIRO_QUARTZ_H
 #ifdef  CAIRO_HAS_QUARTZ_SURFACE
 
+#include <Carbon/Carbon.h>
+
 void
 cairo_set_target_quartz_context(   	cairo_t		*cr,
 					CGContextRef    context,

Index: cairo_atsui_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_atsui_font.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo_atsui_font.c	16 Jan 2005 16:35:14 -0000	1.1
+++ cairo_atsui_font.c	21 Jan 2005 04:36:25 -0000	1.2
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "cairo-atsui.h"
 #include "cairoint.h"
 
 
@@ -71,7 +72,7 @@
 
 
 
-CGAffineTransform CGAffineTransformMakeWithCairoFontScale(cairo_font_scale_t scale)
+static CGAffineTransform CGAffineTransformMakeWithCairoFontScale(cairo_font_scale_t scale)
 {
 	return CGAffineTransformMake(	scale.matrix[0][0],	scale.matrix[0][1],
 									scale.matrix[1][0],	scale.matrix[1][1],
@@ -79,7 +80,7 @@
 }
 
 
-ATSUStyle CreateSizedCopyOfStyle(ATSUStyle inStyle, cairo_font_scale_t	*scale)
+static ATSUStyle CreateSizedCopyOfStyle(ATSUStyle inStyle, cairo_font_scale_t	*scale)
 {
 	ATSUStyle				style;
 	OSStatus				err;
@@ -570,7 +571,7 @@
 #pragma mark -
 
 
-OSStatus MyATSCubicMoveToCallback(const Float32Point *pt, void *callBackDataPtr)
+static OSStatus MyATSCubicMoveToCallback(const Float32Point *pt, void *callBackDataPtr)
 {
     cairo_ATSUI_glyph_path_callback_info_t	*info = callBackDataPtr;
     double									scaledPt[2];
@@ -592,7 +593,7 @@
 }
 
 
-OSStatus MyATSCubicLineToCallback(const Float32Point *pt, void *callBackDataPtr)
+static OSStatus MyATSCubicLineToCallback(const Float32Point *pt, void *callBackDataPtr)
 {
     cairo_ATSUI_glyph_path_callback_info_t	*info = callBackDataPtr;
     cairo_point_t							point;
@@ -614,7 +615,7 @@
 }
 
 
-OSStatus MyATSCubicCurveToCallback( const Float32Point *pt1, 
+static OSStatus MyATSCubicCurveToCallback( const Float32Point *pt1, 
 									const Float32Point *pt2, 
 									const Float32Point *pt3, 
 									void *callBackDataPtr)
@@ -658,7 +659,7 @@
 }
 
 
-OSStatus MyCubicClosePathProc(void * callBackDataPtr) 
+static OSStatus MyCubicClosePathProc(void * callBackDataPtr) 
 {
     cairo_ATSUI_glyph_path_callback_info_t	*info = callBackDataPtr;
     

Index: cairo_quartz_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_quartz_surface.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo_quartz_surface.c	16 Jan 2005 16:35:14 -0000	1.1
+++ cairo_quartz_surface.c	21 Jan 2005 04:36:25 -0000	1.2
@@ -34,15 +34,10 @@
  */
 
 #include "cairoint.h"
-
-
-
+#include "cairo-quartz.h"
 
 #pragma mark Types
 
-
-
-
 typedef struct cairo_quartz_surface {
     cairo_surface_t	    base;