[cairo-commit] rcairo/packages/cairo/ext rb_cairo_surface.c, 1.21, 1.22

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo/packages/cairo/ext
In directory kemper:/tmp/cvs-serv30344/packages/cairo/ext

Modified Files:
	rb_cairo_surface.c 
Log Message:
* packages/cairo/ext/rb_cairo_surface.c: supported
  Cairo::SVGSurface.

* samples/scalable.rb:
  - created by merging ps.rb, ps2.rb, pdf.rb and pdf2.rb.
  - added Cairo::SVGSurface example.
* samples/ps.rb, samples/ps2.rb, samples/pdf.rb, samples/pdf2.rb:
  merged into scalable.rb.

* samples/pac.rb, samples/pac2.rb: added Cairo::SVGSurface
  example.


Index: rb_cairo_surface.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_surface.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- rb_cairo_surface.c	18 Oct 2005 12:16:07 -0000	1.21
+++ rb_cairo_surface.c	1 May 2006 07:44:41 -0000	1.22
@@ -16,14 +16,18 @@
 #include "rubyio.h"
 
 #if CAIRO_HAS_PS_SURFACE
-#include <cairo-ps.h>
+#  include <cairo-ps.h>
 #endif
 
 #if CAIRO_HAS_PDF_SURFACE
-#include <cairo-pdf.h>
+#  include <cairo-pdf.h>
 #endif
 
-#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE
+#if CAIRO_HAS_SVG_SURFACE
+#  include <cairo-svg.h>
+#endif
+
+#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_SVG_SURFACE
 #  define HAS_CREATE_CR_CLOSURE_SURFACE 1
 #else
 #  define HAS_CREATE_CR_CLOSURE_SURFACE 0
@@ -34,6 +38,7 @@
 VALUE rb_cCairo_ImageSurface;
 VALUE rb_cCairo_PDFSurface;
 VALUE rb_cCairo_PSSurface;
+VALUE rb_cCairo_SVGSurface;
 
 static ID cr_id_read;
 static ID cr_id_write;
@@ -615,6 +620,11 @@
 DEFINE_SURFACE(pdf)
 #endif
 
+#if CAIRO_HAS_SVG_SURFACE
+/* SVG-surface functions */
+DEFINE_SURFACE(svg)
+#endif
+
 void
 Init_cairo_surface (void)
 {
@@ -689,4 +699,11 @@
 #else
   rb_cCairo_PDFSurface = Qnil;
 #endif
+
+#if CAIRO_HAS_SVG_SURFACE
+  /* SVG-surface */
+  INIT_SURFACE(svg, SVG)
+#else
+  rb_cCairo_SVGSurface = Qnil;
+#endif
 }