[cairo-commit] cairo ChangeLog, 1.1177, 1.1178 configure.in, 1.159, 1.160

[Emmanuel Pacaud]

Committed by: emmanuel

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv27212

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-12-19  Emmanuel Pacaud <emmanuel.pacaud at free.fr>

	* configure.in: CAIRO_CAN_TEST_SVG_SURFACE depends on librsvg.
	* src/cairo-svg-surface.c: cairo_svg_surface_t owns a xml node, for
	support of svg_surface_composite.
	(_cairo_svg_surface_create_for_document): init xml_node. All surfaces
	except first one are stored in defs node.
	(emit_composite_image_pattern): returns pattern size, and don't call
	emit_transform if is_pattern == TRUE.
	(emit_composite_svg_pattern): do something.
	(emit_composite_pattern): returns pattern size.
	(_cairo_svg_surface_composite): xml_node is stored in
	cairo_svg_surface_t now.
	(emit_surface_pattern): emit surface pattern width here.
	Fix property names.
	(_cairo_svg_path_close_path): don't close path if no current point.
	(_cairo_svg_surface_fill_rectangles): new.
	(_cairo_svg_surface_fill): emit fill rule. xml_node is in surface now.
	(_cairo_svg_surface_composite_trapezoids): xml_node is in surface now.
	(_cairo_svg_surface_stroke): ditto.
	(_cairo_svg_surface_intersect_clip_path): ditto. Emit fill rule.
	* test/.cvsignore: ignore svg2png.
	* test/Makefile.am: build svg2png utility.
	* test/cairo-test.c (create_svg_surface): new.
	(svg_surface_write_to_png): new.
	(cleanup_svg): new.
	(cairo_test_expecting): test SVG backend if CAIRO_HAS_SVG_SURFACE &&
	CAIRO_CAN_TEST_SVG_SURFACE.
	* test/svg2png.c: new.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1177
retrieving revision 1.1178
diff -u -d -r1.1177 -r1.1178
--- ChangeLog	19 Dec 2005 19:01:42 -0000	1.1177
+++ ChangeLog	19 Dec 2005 21:59:34 -0000	1.1178
@@ -1,3 +1,33 @@
+2005-12-19  Emmanuel Pacaud <emmanuel.pacaud at free.fr>
+
+	* configure.in: CAIRO_CAN_TEST_SVG_SURFACE depends on librsvg.
+	* src/cairo-svg-surface.c: cairo_svg_surface_t owns a xml node, for
+	support of svg_surface_composite.
+	(_cairo_svg_surface_create_for_document): init xml_node. All surfaces
+	except first one are stored in defs node.
+	(emit_composite_image_pattern): returns pattern size, and don't call
+	emit_transform if is_pattern == TRUE.
+	(emit_composite_svg_pattern): do something.
+	(emit_composite_pattern): returns pattern size.
+	(_cairo_svg_surface_composite): xml_node is stored in
+	cairo_svg_surface_t now.
+	(emit_surface_pattern): emit surface pattern width here.
+	Fix property names.
+	(_cairo_svg_path_close_path): don't close path if no current point.
+	(_cairo_svg_surface_fill_rectangles): new.
+	(_cairo_svg_surface_fill): emit fill rule. xml_node is in surface now.
+	(_cairo_svg_surface_composite_trapezoids): xml_node is in surface now.
+	(_cairo_svg_surface_stroke): ditto.
+	(_cairo_svg_surface_intersect_clip_path): ditto. Emit fill rule.
+	* test/.cvsignore: ignore svg2png.
+	* test/Makefile.am: build svg2png utility.
+	* test/cairo-test.c (create_svg_surface): new.
+	(svg_surface_write_to_png): new.
+	(cleanup_svg): new.
+	(cairo_test_expecting): test SVG backend if CAIRO_HAS_SVG_SURFACE &&
+	CAIRO_CAN_TEST_SVG_SURFACE.
+	* test/svg2png.c: new.
+
 2005-12-19  Christian Biesinger  <cbiesinger at web.de>
 
 	* configure.in:

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- configure.in	19 Dec 2005 19:01:42 -0000	1.159
+++ configure.in	19 Dec 2005 21:59:34 -0000	1.160
@@ -524,9 +524,19 @@
 AM_CONDITIONAL(CAIRO_HAS_SVG_SURFACE, test "x$use_svg" = "xyes")
 if test "x$use_svg" = "xyes"; then
   SVG_SURFACE_FEATURE="#define CAIRO_HAS_SVG_SURFACE 1"
+  PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 gdk-2.0, [test_svg=yes], [test_svg=no])
+  if test "x$test_svg" = "xyes"; then
+    AC_DEFINE([CAIRO_CAN_TEST_SVG_SURFACE], 1, [Define to 1 if the SVG backend can be tested (need librsvg)])
+  else
+    AC_MSG_WARN([SVG backend will not be tested since a librsvg is not available])
+  fi
 fi
 AC_SUBST(SVG_SURFACE_FEATURE)
 
+AM_CONDITIONAL(CAIRO_CAN_TEST_SVG_SURFACE, test "x$test_svg" = "xyes")
+AC_SUBST(LIBRSVG_CFLAGS)
+AC_SUBST(LIBRSVG_LIBS)
+
 CAIRO_CFLAGS="$CAIRO_CFLAGS $XML_CFLAGS"
 CAIRO_LIBS="$CAIRO_LIBS $XML_LIBS"