[cairo-commit] cairo/test cairo-test-beos.cpp, 1.2, 1.3 cairo-test-beos.h, 1.1, 1.2

[Christian Biesinger]

Committed by: biesi

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv24132/test

Modified Files:
	cairo-test-beos.cpp cairo-test-beos.h 
Log Message:
2006-01-21  Christian Biesinger  <cbiesinger at web.de>

	* test/cairo-test-beos.cpp: (create_beos_surface),
	(create_beos_bitmap_surface):
	* test/cairo-test-beos.h:

	Update BeOS test code per the cairo_format_t -> cairo_content_t
	changes.


Index: cairo-test-beos.cpp
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test-beos.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo-test-beos.cpp	27 Dec 2005 00:44:41 -0000	1.2
+++ cairo-test-beos.cpp	21 Jan 2006 17:46:13 -0000	1.3
@@ -170,7 +170,7 @@
 
 // Test a real window
 cairo_surface_t *
-create_beos_surface (cairo_test_t* test, cairo_format_t format, void **closure)
+create_beos_surface (cairo_test_t* test, cairo_content_t content, void **closure)
 {
     float right = test->width ? test->width - 1 : 0;
     float bottom = test->height ? test->height - 1 : 0;
@@ -200,12 +200,12 @@
 
 // Test a bitmap
 cairo_surface_t *
-create_beos_bitmap_surface (cairo_test_t* test, cairo_format_t format,
+create_beos_bitmap_surface (cairo_test_t* test, cairo_content_t content,
 	                    void **closure)
 {
     BRect rect(0.0, 0.0, test->width - 1, test->height - 1);
-    color_space beosformat = (format == CAIRO_FORMAT_RGB24) ? B_RGB32
-							    : B_RGBA32;
+    color_space beosformat = (content == CAIRO_CONTENT_COLOR_ALPHA) ? B_RGBA32
+								    : B_RGB32;
     BBitmap* bmp = new BBitmap(rect, beosformat, true);
     BView* view = new BView(rect, "Cairo test view", B_FOLLOW_ALL_SIDES, 0);
     bmp->AddChild(view);

Index: cairo-test-beos.h
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test-beos.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo-test-beos.h	19 Dec 2005 01:20:07 -0000	1.1
+++ cairo-test-beos.h	21 Jan 2006 17:46:13 -0000	1.2
@@ -8,14 +8,14 @@
 CAIRO_BEGIN_DECLS
 
 extern cairo_surface_t *
-create_beos_surface (cairo_test_t* test, cairo_format_t format,
+create_beos_surface (cairo_test_t* test, cairo_content_t content,
                      void **closure);
 
 extern void
 cleanup_beos (void* closure);
 
 extern cairo_surface_t *
-create_beos_bitmap_surface (cairo_test_t* test, cairo_format_t format,
+create_beos_bitmap_surface (cairo_test_t* test, cairo_content_t content,
                             void **closure);
 
 extern void