[cairo-commit] cairo-perl ChangeLog, 1.21, 1.22 CairoSurface.xs, 1.11, 1.12 Makefile.PL, 1.14, 1.15

[Torsten Schoenfeld]

Committed by: tsch

Update of /cvs/cairo/cairo-perl
In directory kemper:/tmp/cvs-serv2257

Modified Files:
	ChangeLog CairoSurface.xs Makefile.PL 
Log Message:
	* Makefile.PL: Require cairo >= 1.1.8.

	* CairoSurface.xs, t/CairoSurface.t: Wrap and test
	cairo_surface_set_fallback_resolution,
	cairo_image_surface_get_data, cairo_image_surface_get_format, and
	cairo_image_surface_get_stride.  Remove the wrappers and tests for
	cairo_pdf_surface_set_dpi and cairo_ps_surface_set_dpi.

	* t/CairoSurface.t: Test Cairo::ImageSurface::get_width and
	get_height.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-perl/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	3 Jun 2006 14:21:09 -0000	1.21
+++ ChangeLog	14 Jun 2006 18:20:23 -0000	1.22
@@ -1,3 +1,16 @@
+2006/06/14	tsch
+
+	* Makefile.PL: Require cairo >= 1.1.8.
+
+	* CairoSurface.xs, t/CairoSurface.t: Wrap and test
+	cairo_surface_set_fallback_resolution,
+	cairo_image_surface_get_data, cairo_image_surface_get_format, and
+	cairo_image_surface_get_stride.  Remove the wrappers and tests for
+	cairo_pdf_surface_set_dpi and cairo_ps_surface_set_dpi.
+
+	* t/CairoSurface.t: Test Cairo::ImageSurface::get_width and
+	get_height.
+
 2006/06/03	tsch
 
 	* Cairo.pm: Document Cairo::get_group_target, Cairo::new_sub_path,

Index: CairoSurface.xs
===================================================================
RCS file: /cvs/cairo/cairo-perl/CairoSurface.xs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CairoSurface.xs	3 Jun 2006 14:21:09 -0000	1.11
+++ CairoSurface.xs	14 Jun 2006 18:20:23 -0000	1.12
@@ -209,6 +209,8 @@
 	PUSHs (sv_2mortal (newSVnv (x_offset)));
 	PUSHs (sv_2mortal (newSVnv (y_offset)));
 
+void cairo_surface_set_fallback_resolution (cairo_surface_t *surface, double x_pixels_per_inch, double y_pixels_per_inch);
+
 ##void cairo_surface_get_font_options (cairo_surface_t *surface, cairo_font_options_t *options);
 cairo_font_options_t * cairo_surface_get_font_options (cairo_surface_t *surface)
     CODE:
@@ -261,10 +263,25 @@
     C_ARGS:
 	data, format, width, height, stride
 
+# unsigned char * cairo_image_surface_get_data (cairo_surface_t *surface);
+SV *
+cairo_image_surface_get_data (cairo_surface_t *surface)
+    PREINIT:
+	unsigned char *data;
+    CODE:
+	data = cairo_image_surface_get_data (surface);
+	RETVAL = data ? newSVpv ((char *) data, 0) : &PL_sv_undef;
+    OUTPUT:
+	RETVAL
+
+cairo_format_t cairo_image_surface_get_format (cairo_surface_t *surface);
+
 int cairo_image_surface_get_width (cairo_surface_t *surface);
 
 int cairo_image_surface_get_height (cairo_surface_t *surface);
 
+int cairo_image_surface_get_stride (cairo_surface_t *surface);
+
 #ifdef CAIRO_HAS_PNG_FUNCTIONS
 
 ##cairo_surface_t * cairo_image_surface_create_from_png (const char *filename);
@@ -315,8 +332,6 @@
     OUTPUT:
 	RETVAL
 
-void cairo_pdf_surface_set_dpi (cairo_surface_t *surface, double x_dpi, double y_dpi);
-
 void cairo_pdf_surface_set_size (cairo_surface_t *surface, double width_in_points, double height_in_points);
 
 #endif
@@ -349,8 +364,6 @@
     OUTPUT:
 	RETVAL
 
-void cairo_ps_surface_set_dpi (cairo_surface_t *surface, double x_dpi, double y_dpi);
-
 void cairo_ps_surface_set_size (cairo_surface_t	*surface, double width_in_points, double height_in_points);
 
 void cairo_ps_surface_dsc_comment (cairo_surface_t *surface, const char *comment);

Index: Makefile.PL
===================================================================
RCS file: /cvs/cairo/cairo-perl/Makefile.PL,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.PL	3 Jun 2006 14:21:09 -0000	1.14
+++ Makefile.PL	14 Jun 2006 18:20:23 -0000	1.15
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004-2005 by the cairo perl team (see the file README)
+# Copyright (c) 2004-2006 by the cairo perl team (see the file README)
 #
 # Licensed under the LGPL, see LICENSE file for more information.
 #
@@ -47,7 +47,7 @@
 mkdir $autogen_dir unless (-d $autogen_dir);
 $MakeHelper::autogen_dir = $autogen_dir;
 
-my %cairo_cfg = ExtUtils::PkgConfig->find ('cairo >= 1.1.7');
+my %cairo_cfg = ExtUtils::PkgConfig->find ('cairo >= 1.1.8');
 
 my %backend_macros = (
 	'cairo_pdf_surface_t' => 'CAIRO_HAS_PDF_SURFACE',
@@ -55,11 +55,11 @@
 );
 
 my %objects = (
-	'cairo_t *'                 => 'Cairo::Context',
-	'cairo_font_face_t *'       => 'Cairo::FontFace',
-	'cairo_pattern_t *'         => 'Cairo::Pattern',
-	'cairo_scaled_font_t *'     => 'Cairo::ScaledFont',
-	'cairo_surface_t *'         => 'Cairo::Surface',
+	'cairo_t *'             => 'Cairo::Context',
+	'cairo_font_face_t *'   => 'Cairo::FontFace',
+	'cairo_pattern_t *'     => 'Cairo::Pattern',
+	'cairo_scaled_font_t *' => 'Cairo::ScaledFont',
+	'cairo_surface_t *'     => 'Cairo::Surface',
 );
 
 my %structs = (