AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk: Convert test to not use pixmaps

Browse Source
This commit is contained in:
Benjamin Otte 2010-08-27 12:42:35 +02:00
parent 90b4b88629
commit e500f997db
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gdk/tests/check-gdk-cairo.c
View File

@ -47,9 +47,9 @@ test (cairo_t* cr)
} }
static void static void
test_pixmap_orientation (void) test_surface_orientation (void)
{ {
GdkPixmap* pixmap; cairo_surface_t *surface;
GdkPixbuf* pixbuf; GdkPixbuf* pixbuf;
GdkPixbuf* pbuf_platform; GdkPixbuf* pbuf_platform;
GdkPixbuf* pbuf_imagesrf; GdkPixbuf* pbuf_imagesrf;
@ -60,24 +60,26 @@ test_pixmap_orientation (void)
guchar* data_imagesrf; guchar* data_imagesrf;
guint i; guint i;
/* create "platform.png" via GdkPixmap */ /* create "platform.png" via native cairo surface */
pixmap = gdk_pixmap_new (NULL /* drawable */, 100 /* w */, 80 /* h */, 24 /* d */); surface = gdk_window_create_similar_surface (gdk_get_default_root_window (),
cr = gdk_cairo_create (pixmap); CAIRO_CONTENT_COLOR,
100,
80);
cr = cairo_create (surface);
test (cr); test (cr);
cairo_destroy (cr); cairo_destroy (cr);
pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixbuf = gdk_pixbuf_get_from_surface (NULL,
pixmap, surface,
gdk_rgb_get_colormap (), 0, 0,
0, 0, 0, 0,
0, 0, 100, 80);
100, 80);
if (!gdk_pixbuf_save (pixbuf, "gdksurface.png", "png", NULL, NULL)) { if (!gdk_pixbuf_save (pixbuf, "gdksurface.png", "png", NULL, NULL)) {
g_error ("Eeek! Couldn't save the file \"gdksurface.png\""); g_error ("Eeek! Couldn't save the file \"gdksurface.png\"");
} }
g_object_unref (pixbuf); g_object_unref (pixbuf);
g_object_unref (pixmap); cairo_surface_destroy (surface);
/* create "cairosurface.png" via pure cairo */ /* create "cairosurface.png" via pure cairo */
#ifndef CAIRO_HAS_QUARTZ_SURFACE #ifndef CAIRO_HAS_QUARTZ_SURFACE
@ -139,8 +141,8 @@ main (int argc,
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
gdk_init (&argc, &argv); gdk_init (&argc, &argv);
g_test_add_func ("/gdk/pixmap/orientation", g_test_add_func ("/gdk/surface/orientation",
test_pixmap_orientation); test_surface_orientation);
return g_test_run (); return g_test_run ();
} }