[cairo-commit] cairo-5c ChangeLog, 1.22, 1.23 cairo.5c, 1.12, 1.13 init.c, 1.14, 1.15

[Keith Packard]

Committed by: keithp

Update of /cvs/cairo/cairo-5c
In directory gabe:/tmp/cvs-serv10469

Modified Files:
	ChangeLog cairo.5c init.c 
Log Message:
2005-06-06  Keith Packard  <keithp at keithp.com>

	* cairo.5c:
	* init.c: (init_types), (nickle_init):
	Enum order and names changed in API shuffle.
	
	* examples/fob.5c:
	Create .png files by default


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-5c/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ChangeLog	7 Jun 2005 03:41:36 -0000	1.22
+++ ChangeLog	7 Jun 2005 05:09:35 -0000	1.23
@@ -1,6 +1,15 @@
 2005-06-06  Keith Packard  <keithp at keithp.com>
 
 	* cairo.5c:
+	* init.c: (init_types), (nickle_init):
+	Enum order and names changed in API shuffle.
+	
+	* examples/fob.5c:
+	Create .png files by default
+
+2005-06-06  Keith Packard  <keithp at keithp.com>
+
+	* cairo.5c:
 	* examples/animate.5c:
 	* gtk.c: (gtk_repaint_timeout), (gtk_thread_main),
 	(cairo_5c_tool_dirty):

Index: cairo.5c
===================================================================
RCS file: /cvs/cairo/cairo-5c/cairo.5c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cairo.5c	7 Jun 2005 03:41:36 -0000	1.12
+++ cairo.5c	7 Jun 2005 05:09:35 -0000	1.13
@@ -85,7 +85,7 @@
 	cairo_t	    cr = create (surface);
 	
 	set_source_rgba (cr, 0, 0, 0, 0);
-	set_operator (cr, operator_t.SRC);
+	set_operator (cr, operator_t.SOURCE);
 	paint (cr);
 	set_operator (cr, operator_t.OVER);
 	set_source_rgba (cr, 0, 0, 0, 1);

Index: init.c
===================================================================
RCS file: /cvs/cairo/cairo-5c/init.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- init.c	18 May 2005 06:21:15 -0000	1.14
+++ init.c	7 Jun 2005 05:09:35 -0000	1.15
@@ -163,7 +163,7 @@
 				    publish_public,
 				    STATUS_I,
 				    NULL,
-				    BuildEnumType (8,
+				    BuildEnumType (14,
 						   "SUCCESS",
 						   "NO_MEMORY",
 						   "INVALID_RESTORE",
@@ -171,7 +171,13 @@
 						   "NO_CURRENT_POINT",
 						   "INVALID_MATRIX",
 						   "NO_TARGET_SURFACE",
-						   "NULL_POINTER"));
+						   "NULL_POINTER",
+						   "INVALID_STRING",
+						   "INVALID_PATH_DATA",
+						   "READ_ERROR",
+						   "WRITE_ERROR",
+						   "SURFACE_FINISHED",
+						   "SURFACE_TYPE_MISMATCH"));
     typeCairoOperator = make_typedef ("operator_t",
 				      CairoNamespace,
 				      publish_public,
@@ -179,16 +185,19 @@
 				      NULL,
 				      BuildEnumType (14,
 						     "CLEAR",
-						     "SRC",
-						     "DST",
+						     
+						     "SOURCE",
 						     "OVER",
-						     "OVER_REVERSE",
 						     "IN",
-						     "IN_REVERSE",
 						     "OUT",
-						     "OUT_REVERSE",
 						     "ATOP",
-						     "ATOP_REVERSE",
+						     
+						     "DEST",
+						     "DEST_OVER",
+						     "DEST_IN",
+						     "DEST_OUT",
+						     "DEST_ATOP",
+						     
 						     "XOR",
 						     "ADD",
 						     "SATURATE"));
@@ -936,7 +945,7 @@
     };
 					 
     static const struct fbuiltin_3 imgfuncs_3[] = {
-	{ do_Cairo_Image_surface_create, "surface_create", SURFACE_S, "nnn", "\n"
+	{ do_Cairo_Image_surface_create, "surface_create", SURFACE_S, "iii", "\n"
 	    " surface_t surface_create (int format, int width, int height)\n"
 	    "\n"
 	    " Create an image surface of the specified size in pixels\n" },