[cairo-commit] cairo/src cairo-win32-surface.c,1.26,1.27

[Carl Worth]

Committed by: cworth

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

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

        From:           J. Ali Harlow" <ali at avrc.city.ac.uk>
        Reviewed by:    Vladimir Vukicevic <vladimirv at gmail.com>

        * test/Makefile.am:
        * src/cairo-win32-surface.c: (_cairo_win32_surface_create_for_dc),
        (_cairo_win32_surface_create_similar),
        (_cairo_win32_surface_create_dib),
        (_cairo_win32_surface_composite), (categorize_solid_dest_operator),
        (_cairo_win32_surface_set_clip_region): Update win32 backend to
        match current API, so it actually builds once again.


Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cairo-win32-surface.c	15 Jun 2005 02:45:23 -0000	1.26
+++ cairo-win32-surface.c	25 Jun 2005 09:00:17 -0000	1.27
@@ -240,7 +240,6 @@
 static cairo_surface_t *
 _cairo_win32_surface_create_for_dc (HDC             original_dc,
 				    cairo_format_t  format,
-				    int	            drawable,
 				    int	            width,
 				    int	            height)
 {
@@ -297,8 +296,7 @@
 {
     cairo_win32_surface_t *src = abstract_src;
 
-    return _cairo_win32_surface_create_for_dc (src->dc, format, drawable,
-					       width, height);
+    return _cairo_win32_surface_create_for_dc (src->dc, format, width, height);
 }
 
 /**
@@ -319,8 +317,7 @@
 				 int	        width,
 				 int	        height)
 {
-    return _cairo_win32_surface_create_for_dc (NULL, format, TRUE,
-					       width, height);
+    return _cairo_win32_surface_create_for_dc (NULL, format, width, height);
 }
 
 static cairo_status_t
@@ -577,7 +574,6 @@
     } else if (integer_transform &&
 	       (src->format == CAIRO_FORMAT_RGB24 || src->format == CAIRO_FORMAT_ARGB32) &&
 	       dst->format == CAIRO_FORMAT_RGB24 &&
-	       !src->base.repeat &&
 	       operator == CAIRO_OPERATOR_OVER) {
 
 	BLENDFUNCTION blend_function;
@@ -675,6 +671,9 @@
 	    return DO_UNSUPPORTED;
 	break;
     }	
+
+    ASSERT_NOT_REACHED;
+    return DO_UNSUPPORTED;
 }
 
 static cairo_int_status_t
@@ -751,8 +750,12 @@
     /* If we are in-memory, then we set the clip on the image surface
      * as well as on the underlying GDI surface.
      */
-    if (surface->image)
-	_cairo_surface_set_clip_region (surface->image, region);
+    if (surface->image) {
+	unsigned int serial;
+
+	serial = _cairo_surface_allocate_clip_serial (surface->image);
+	_cairo_surface_set_clip_region (surface->image, region, serial);
+    }
 
     /* The semantics we want is that any clip set by cairo combines
      * is intersected with the clip on device context that the