[cairo-commit] cairo-demo/X11 ChangeLog, 1.15, 1.16 cairo-knockout.c, 1.16, 1.17

[Kristian Hogsberg]

Committed by: krh

Update of /cvs/cairo/cairo-demo/X11
In directory gabe:/tmp/cvs-serv16371

Modified Files:
	ChangeLog cairo-knockout.c 
Log Message:
2005-07-25  Kristian Høgsberg  <krh at redhat.com>

        * cairo-knockout.c (fill_checks, draw): Update for cairo_content_t
        API changes.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	17 May 2005 14:50:15 -0000	1.15
+++ ChangeLog	25 Jul 2005 21:28:09 -0000	1.16
@@ -1,3 +1,8 @@
+2005-07-25  Kristian Høgsberg  <krh at redhat.com>
+
+	* cairo-knockout.c (fill_checks, draw): Update for cairo_content_t
+	API changes.
+
 2005-05-17  Carl Worth  <cworth at cworth.org>
 
 	* cairo-demo-xcb.c: (win_draw):

Index: cairo-knockout.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-knockout.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cairo-knockout.c	17 May 2005 14:50:15 -0000	1.16
+++ cairo-knockout.c	25 Jul 2005 21:28:09 -0000	1.17
@@ -60,8 +60,8 @@
 #define CHECK_SIZE 32
 
     check = cairo_surface_create_similar (cairo_get_target (cr),
-                                   CAIRO_FORMAT_RGB24,
-                                   2 * CHECK_SIZE, 2 * CHECK_SIZE);
+                                          CAIRO_CONTENT_COLOR,
+                                          2 * CHECK_SIZE, 2 * CHECK_SIZE);
 
     /* Draw the check */
     {
@@ -146,20 +146,20 @@
     double yc = height / 2.;
 
     overlay = cairo_surface_create_similar (cairo_get_target (cr),
-                                     CAIRO_FORMAT_ARGB32,
-                                     width, height);
+                                            CAIRO_CONTENT_COLOR_ALPHA,
+                                            width, height);
     if (overlay == NULL)
         return;
 
     punch = cairo_surface_create_similar (cairo_get_target (cr),
-                                   CAIRO_FORMAT_A8,
-                                   width, height);
+                                          CAIRO_CONTENT_ALPHA,
+                                          width, height);
     if (punch == NULL)
         return;
 
     circles = cairo_surface_create_similar (cairo_get_target (cr),
-                                     CAIRO_FORMAT_ARGB32,
-                                     width, height);
+                                            CAIRO_CONTENT_COLOR_ALPHA,
+                                            width, height);
     if (circles == NULL)
         return;