[cairo-commit] cairo/src cairo-xcb-surface.c, 1.23, 1.24 cairo-win32-surface.c, 1.19, 1.20 cairo-surface.c, 1.66, 1.67 cairo-gstate.c, 1.123, 1.124

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv8623/src

Modified Files:
	cairo-xcb-surface.c cairo-win32-surface.c cairo-surface.c 
	cairo-gstate.c 
Log Message:

        * src/cairo-xcb-surface.c (_render_operator):
        * src/cairo-win32-surface.c (_cairo_win32_surface_composite)
        (_cairo_win32_surface_fill_rectangles): Update to track new
        CAIRO_OPERATOR names.

        * test/select-font-no-show-text.c:
        * src/cairo-surface.c (cairo_surface_set_user_data): Fix
        documentation to refer to functions by their current names.

        * src/cairo-gstate.c (_cairo_gstate_begin_group): Update to track
        latest API (in currently unused function).


Index: cairo-xcb-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xcb-surface.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cairo-xcb-surface.c	19 Apr 2005 23:29:05 -0000	1.23
+++ cairo-xcb-surface.c	7 May 2005 04:19:50 -0000	1.24
@@ -646,25 +646,25 @@
     switch (operator) {
     case CAIRO_OPERATOR_CLEAR:
 	return XCBRenderPictOpClear;
-    case CAIRO_OPERATOR_SRC:
+    case CAIRO_OPERATOR_SOURCE:
 	return XCBRenderPictOpSrc;
-    case CAIRO_OPERATOR_DST:
+    case CAIRO_OPERATOR_DEST:
 	return XCBRenderPictOpDst;
     case CAIRO_OPERATOR_OVER:
 	return XCBRenderPictOpOver;
-    case CAIRO_OPERATOR_OVER_REVERSE:
+    case CAIRO_OPERATOR_DEST_OVER:
 	return XCBRenderPictOpOverReverse;
     case CAIRO_OPERATOR_IN:
 	return XCBRenderPictOpIn;
-    case CAIRO_OPERATOR_IN_REVERSE:
+    case CAIRO_OPERATOR_DEST_IN:
 	return XCBRenderPictOpInReverse;
     case CAIRO_OPERATOR_OUT:
 	return XCBRenderPictOpOut;
-    case CAIRO_OPERATOR_OUT_REVERSE:
+    case CAIRO_OPERATOR_DEST_OUT:
 	return XCBRenderPictOpOutReverse;
     case CAIRO_OPERATOR_ATOP:
 	return XCBRenderPictOpAtop;
-    case CAIRO_OPERATOR_ATOP_REVERSE:
+    case CAIRO_OPERATOR_DEST_ATOP:
 	return XCBRenderPictOpAtopReverse;
     case CAIRO_OPERATOR_XOR:
 	return XCBRenderPictOpXor;

Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cairo-win32-surface.c	26 Apr 2005 02:38:44 -0000	1.19
+++ cairo-win32-surface.c	7 May 2005 04:19:50 -0000	1.20
@@ -565,7 +565,7 @@
 
     if (alpha == 255 &&
 	src->format == dst->format &&
-	(operator == CAIRO_OPERATOR_SRC ||
+	(operator == CAIRO_OPERATOR_SOURCE ||
 	 (src->format == CAIRO_FORMAT_RGB24 && operator == CAIRO_OPERATOR_OVER))) {
 	
 	if (!BitBlt (dst->dc,
@@ -626,11 +626,11 @@
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     
     /* We could support possibly support more operators for color->alpha = 0xffff.
-     * for CAIRO_OPERATOR_SRC, alpha doesn't matter since we know the destination
+     * for CAIRO_OPERATOR_SOURCE, alpha doesn't matter since we know the destination
      * image doesn't have alpha. (surface->pixman_image is non-NULL for all
      * surfaces with alpha.)
      */
-    if (operator != CAIRO_OPERATOR_SRC)
+    if (operator != CAIRO_OPERATOR_SOURCE)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     new_color = RGB (color->red_short >> 8, color->green_short >> 8, color->blue_short >> 8);

Index: cairo-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-surface.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- cairo-surface.c	6 May 2005 20:32:53 -0000	1.66
+++ cairo-surface.c	7 May 2005 04:19:50 -0000	1.67
@@ -364,7 +364,7 @@
  * way that is completely invisible to the user of the cairo
  * API. Setting a transformation via cairo_translate() isn't
  * sufficient to do this, since functions like
- * cairo_inverse_transform_point() will expose the hidden offset.
+ * cairo_device_to_user() will expose the hidden offset.
  *
  * Note that the offset only affects drawing to the surface, not using
  * the surface in a surface pattern.

Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- cairo-gstate.c	6 May 2005 20:32:53 -0000	1.123
+++ cairo-gstate.c	7 May 2005 04:19:50 -0000	1.124
@@ -278,7 +278,7 @@
     _cairo_surface_set_drawableWH (gstate->surface, pix, width, height);
 
     status = _cairo_surface_fill_rectangle (gstate->surface,
-                                   CAIRO_OPERATOR_SRC,
+                                   CAIRO_OPERATOR_SOURCE,
 				   &CAIRO_COLOR_TRANSPARENT,
 				   0, 0,
 			           _cairo_surface_get_width (gstate->surface),