[cairo-commit] cairo/src Makefile.am, 1.67, 1.68 cairo-features.h.in, 1.22, 1.23 cairo-output-stream.c, 1.8, 1.9 cairo-svg-surface.c, NONE, 1.1 cairo-svg.h, NONE, 1.1 cairoint.h, 1.230, 1.231

[Emmanuel Pacaud]

Committed by: emmanuel

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

Modified Files:
	Makefile.am cairo-features.h.in cairo-output-stream.c 
	cairoint.h 
Added Files:
	cairo-svg-surface.c cairo-svg.h 
Log Message:
2005-12-08  Emmanuel Pacaud <emmanuel.pacaud at free.fr>

	* configure.in: add optionnal disabled by default SVG backend.
	
	* src/Makefile.am: include SVG backend files.
	* src/cairo-features.h.in: include SVG_SURFACE_FEATURE.
	* src/cairo-output-stream.c: rename dtostr to _cairo_dtostr for use in
	cairo-svg-surface.c.
	* src/cairoint.h: _cairo_dtostr declaration.
	* src/cairo-svg.h: new.
	* src/cairo-svg-surface.c: new.
	
	* test/Makefile.am: build svg-surface and svg-clip.
	* test/svg-surface.c: new.
	* test/svg-surface.h: new.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- Makefile.am	7 Nov 2005 17:49:52 -0000	1.67
+++ Makefile.am	8 Dec 2005 21:09:27 -0000	1.68
@@ -11,6 +11,11 @@
 libcairo_font_subset_sources = cairo-font-subset.c cairo-font-subset-private.h
 endif
 
+if CAIRO_HAS_SVG_SURFACE
+libcairo_svg_headers = cairo-svg.h
+libcairo_svg_sources = cairo-svg-surface.c
+endif
+
 if CAIRO_HAS_PNG_FUNCTIONS
 libcairo_png_sources = cairo-png.c
 endif
@@ -80,6 +85,7 @@
 	$(libcairo_ft_headers)		\
 	$(libcairo_glitz_headers)	\
 	$(libcairo_pdf_headers)		\
+	$(libcairo_svg_headers)		\
 	$(libcairo_ps_headers)		\
 	$(libcairo_quartz_headers)	\
 	$(libcairo_win32_headers)	\
@@ -139,6 +145,7 @@
 	$(libcairo_ft_sources)			\
 	$(libcairo_ps_sources)			\
 	$(libcairo_pdf_sources)			\
+	$(libcairo_svg_sources)			\
 	$(libcairo_font_subset_sources)		\
 	$(libcairo_png_sources)			\
 	$(libcairo_xlib_sources)		\

Index: cairo-features.h.in
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-features.h.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cairo-features.h.in	7 Sep 2005 23:31:22 -0000	1.22
+++ cairo-features.h.in	8 Dec 2005 21:09:27 -0000	1.23
@@ -59,6 +59,8 @@
 
 @PDF_SURFACE_FEATURE@
 
+ at SVG_SURFACE_FEATURE@
+
 @XLIB_SURFACE_FEATURE@
 
 @QUARTZ_SURFACE_FEATURE@

Index: cairo-output-stream.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-output-stream.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cairo-output-stream.c	5 Aug 2005 14:48:19 -0000	1.8
+++ cairo-output-stream.c	8 Dec 2005 21:09:27 -0000	1.9
@@ -119,8 +119,8 @@
  * http://mail.gnome.org/archives/gtk-devel-list/2001-October/msg00087.html
  */
 
-static int
-dtostr (char *buffer, size_t size, double d)
+int
+_cairo_dtostr (char *buffer, size_t size, double d)
 {
   struct lconv *locale_data;
   const char *decimal_point;
@@ -233,7 +233,7 @@
 	    snprintf (buffer, sizeof buffer, "%s", va_arg (ap, const char *));
 	    break;
 	case 'f':
-	    dtostr (buffer, sizeof buffer, va_arg (ap, double));
+	    _cairo_dtostr (buffer, sizeof buffer, va_arg (ap, double));
 	    break;
 	case 'c':
 	    buffer[0] = va_arg (ap, int);

--- NEW FILE: cairo-svg-surface.c ---
(This appears to be a binary file; contents omitted.)

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

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- cairoint.h	7 Dec 2005 20:19:10 -0000	1.230
+++ cairoint.h	8 Dec 2005 21:09:27 -0000	1.231
@@ -2144,6 +2144,9 @@
 cairo_private void
 _cairo_error (cairo_status_t status);
 
+cairo_private int
+_cairo_dtostr (char *buffer, size_t size, double d);
+
 /* Avoid unnecessary PLT entries.  */
 
 slim_hidden_proto(cairo_get_current_point)