[cairo-commit] cairo/src cairo-win32-font.c, 1.31, 1.32 cairo-win32-surface.c, 1.31, 1.32

[Stuart Parmenter]

Committed by: pavlov

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

Modified Files:
	cairo-win32-font.c cairo-win32-surface.c 
Log Message:
2005-07-28  Stuart Parmenter  <pavlov at pavlov.net>

	* src/cairo-win32-font.c
	* src/cairo-win32-surface.c
	Use surface->base.status instead of just surface on
	cairo_win32_surface_t *s


Index: cairo-win32-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-font.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cairo-win32-font.c	28 Jul 2005 17:15:36 -0000	1.31
+++ cairo-win32-font.c	28 Jul 2005 17:37:41 -0000	1.32
@@ -1009,7 +1009,7 @@
 
     image8 = (cairo_image_surface_t *)cairo_image_surface_create (CAIRO_FORMAT_A8,
 								  image24->width, image24->height);
-    if (image8->status)
+    if (image8->base.status)
 	return NULL;
 
     for (i = 0; i < image24->height; i++) {
@@ -1082,7 +1082,7 @@
 	RECT r;
 
 	tmp_surface = (cairo_win32_surface_t *)_cairo_win32_surface_create_dib (CAIRO_FORMAT_ARGB32, width, height);
-	if (tmp_surface->status)
+	if (tmp_surface->base.status)
 	    return CAIRO_STATUS_NO_MEMORY;
 
 	r.left = 0;

Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cairo-win32-surface.c	28 Jul 2005 16:46:38 -0000	1.31
+++ cairo-win32-surface.c	28 Jul 2005 17:37:41 -0000	1.32
@@ -370,7 +370,7 @@
 								       content,
 								       width,
 								       height);
-    if (local->status)
+    if (local->base.status)
 	return CAIRO_STATUS_NO_MEMORY;
     
     if (!BitBlt (local->dc,