[cairo-commit] cairo-demo/cairo_snippets ChangeLog, 1.31, 1.32 cairo_snippets_pdf.c, 1.5, 1.6 cairo_snippets_ps.c, 1.3, 1.4 prepare_snippets.c, 1.6, 1.7

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-demo/cairo_snippets
In directory gabe:/tmp/cvs-serv6958

Modified Files:
	ChangeLog cairo_snippets_pdf.c cairo_snippets_ps.c 
	prepare_snippets.c 
Log Message:

        * cairo_snippets_pdf.c:
        * cairo_snippets_ps.c:
        * prepare_snippets.c: (make_util):
        * snippets/arc.cairo:
        * snippets/arc_negative.cairo:
        * snippets/curve_rectangle.cairo:
        * snippets/curve_to.cairo:
        * snippets/operator_add.cairo:
        * snippets/operator_atop.cairo:
        * snippets/operator_atop_reverse.cairo:
        * snippets/operator_in.cairo:
        * snippets/operator_in_reverse.cairo:
        * snippets/operator_out.cairo:
        * snippets/operator_out_reverse.cairo:
        * snippets/operator_over.cairo:
        * snippets/operator_over_reverse.cairo:
        * snippets/operator_saturate.cairo:
        * snippets/operator_xor.cairo:
        * snippets/text.cairo:
        * snippets/text_align_center.cairo:
        * snippets/text_extents.cairo: Update for changes in the cairo
        API, including:

                Use 72.0 scale factor instead of 96.0
                Use unsigned char as appropriate
                Use cairo_set_source_rgba instead of cairo_set_rgb_color
                and cairo_set_alpha.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo_snippets/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	2 Apr 2005 02:03:59 -0000	1.31
+++ ChangeLog	21 Apr 2005 21:01:37 -0000	1.32
@@ -1,3 +1,33 @@
+2005-04-22  Carl Worth  <cworth at cworth.org>
+
+	* cairo_snippets_pdf.c:
+	* cairo_snippets_ps.c:
+	* prepare_snippets.c: (make_util):
+	* snippets/arc.cairo:
+	* snippets/arc_negative.cairo:
+	* snippets/curve_rectangle.cairo:
+	* snippets/curve_to.cairo:
+	* snippets/operator_add.cairo:
+	* snippets/operator_atop.cairo:
+	* snippets/operator_atop_reverse.cairo:
+	* snippets/operator_in.cairo:
+	* snippets/operator_in_reverse.cairo:
+	* snippets/operator_out.cairo:
+	* snippets/operator_out_reverse.cairo:
+	* snippets/operator_over.cairo:
+	* snippets/operator_over_reverse.cairo:
+	* snippets/operator_saturate.cairo:
+	* snippets/operator_xor.cairo:
+	* snippets/text.cairo:
+	* snippets/text_align_center.cairo:
+	* snippets/text_extents.cairo: Update for changes in the cairo
+	API, including:
+
+		Use 72.0 scale factor instead of 96.0
+		Use unsigned char as appropriate
+		Use cairo_set_source_rgba instead of cairo_set_rgb_color
+		and cairo_set_alpha.
+	
 2005-04-01  Carl Worth  <cworth at cworth.org>
 
 	* cairo_snippets_png.c: (snippet_do_png): Track removal of

Index: cairo_snippets_pdf.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo_snippets/cairo_snippets_pdf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo_snippets_pdf.c	1 Feb 2005 22:58:09 -0000	1.5
+++ cairo_snippets_pdf.c	21 Apr 2005 21:01:37 -0000	1.6
@@ -10,8 +10,8 @@
 #define X_PPI    300.0
 #define Y_PPI    300.0
 
-#define WIDTH    X_INCHES * 96.0
-#define HEIGHT   Y_INCHES * 96.0
+#define WIDTH    X_INCHES * 72.0
+#define HEIGHT   Y_INCHES * 72.0
 
 /* add a page with the specified snippet to the output pdf file */
 static void

Index: cairo_snippets_ps.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo_snippets/cairo_snippets_ps.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo_snippets_ps.c	24 Feb 2005 16:21:01 -0000	1.3
+++ cairo_snippets_ps.c	21 Apr 2005 21:01:37 -0000	1.4
@@ -10,8 +10,8 @@
 #define X_PPI    300.0
 #define Y_PPI    300.0
 
-#define WIDTH    X_INCHES * 96.0
-#define HEIGHT   Y_INCHES * 96.0
+#define WIDTH    X_INCHES * 72.0
+#define HEIGHT   Y_INCHES * 72.0
 
 /* add a page with the specified snippet to the output ps file */
 static void

Index: prepare_snippets.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo_snippets/prepare_snippets.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prepare_snippets.c	11 Jan 2005 22:38:03 -0000	1.6
+++ prepare_snippets.c	21 Apr 2005 21:01:37 -0000	1.7
@@ -137,7 +137,7 @@
 "snippet_set_bg_png (cairo_t *cr, const char *file)\n"
 "{\n"
 "   int w,h,stride;\n"
-"   char *buffer;\n"
+"   unsigned char *buffer;\n"
 "   cairo_surface_t *image;\n"
 "   buffer = read_png_argb32 (file, &w,&h, &stride);\n"
 "   image = cairo_surface_create_for_image (buffer, CAIRO_FORMAT_ARGB32,w,h,stride);\n"