From 00f3d6ef22b5a062323208fd540a17ca65dca42b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sat, 6 Sep 2008 23:49:25 -0400 Subject: [PATCH] Fix bug in pixman_image_is_opaque() Non-repeating gradient images would be reported as opaque. Also add new test program to test source clipping. --- pixman/pixman-image.c | 4 ++ test/Makefile.am | 4 +- test/clip-test.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 test/clip-test.c diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c index 487a672..e80c479 100644 --- a/pixman/pixman-image.c +++ b/pixman/pixman-image.c @@ -818,6 +818,10 @@ pixman_image_is_opaque(pixman_image_t *image) if (image->common.transform) return FALSE; + + /* Gradients do not necessarily cover the entire compositing area */ + if (image->type == LINEAR || image->type == CONICAL || image->type == RADIAL) + return FALSE; } return TRUE; diff --git a/test/Makefile.am b/test/Makefile.am index ced0579..33e2200 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,6 @@ if HAVE_GTK -TESTPROGRAMS = \ +TESTPROGRAMS = \ + clip-test \ composite-test \ gradient-test \ region-test \ @@ -13,5 +14,6 @@ composite_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS) gradient_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS) fetch_test_LDADD = $(top_builddir)/pixman/libpixman-1.la region_test_LDADD = $(top_builddir)/pixman/libpixman-1.la +clip_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS) endif diff --git a/test/clip-test.c b/test/clip-test.c new file mode 100644 index 0000000..a52181f --- /dev/null +++ b/test/clip-test.c @@ -0,0 +1,133 @@ +#include +#include +#include +#include "pixman.h" + +GdkPixbuf * +pixbuf_from_argb32 (uint32_t *bits, + int width, + int height, + int stride) +{ + GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, + 8, width, height); + int p_stride = gdk_pixbuf_get_rowstride (pixbuf); + guint32 *p_bits = (guint32 *)gdk_pixbuf_get_pixels (pixbuf); + int w, h; + + for (h = 0; h < height; ++h) + { + for (w = 0; w < width; ++w) + { + uint32_t argb = bits[h * stride + w]; + guint32 abgr; + + abgr = (argb & 0xff000000) | + (argb & 0xff) << 16 | + (argb & 0x00ff00) | + (argb & 0xff0000) >> 16; + + p_bits[h * (p_stride / 4) + w] = abgr; + } + } + + return pixbuf; +} + +static gboolean +on_expose (GtkWidget *widget, GdkEventExpose *expose, gpointer data) +{ + GdkPixbuf *pixbuf = data; + + gdk_draw_pixbuf (widget->window, NULL, + pixbuf, 0, 0, 0, 0, + gdk_pixbuf_get_width (pixbuf), + gdk_pixbuf_get_height (pixbuf), + GDK_RGB_DITHER_NONE, + 0, 0); + + return TRUE; +} + +static void +show_window (uint32_t *bits, int w, int h, int stride) +{ + GdkPixbuf *pixbuf; + + GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + + pixbuf = pixbuf_from_argb32 (bits, w, h, stride); + + g_signal_connect (window, "expose_event", G_CALLBACK (on_expose), pixbuf); + g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL); + + gtk_widget_show (window); + + gtk_main (); +} + +int +main (int argc, char **argv) +{ +#define WIDTH 200 +#define HEIGHT 200 + + uint32_t *src = malloc (WIDTH * HEIGHT * 4); + pixman_image_t *gradient_img; + pixman_image_t *src_img; + int i; + pixman_gradient_stop_t stops[2] = + { + { pixman_int_to_fixed (0), { 0xffff, 0x0000, 0x0000, 0xffff } }, + { pixman_int_to_fixed (1), { 0xffff, 0xffff, 0x0000, 0xffff } } + }; + pixman_point_fixed_t p1 = { 0, 0 }; + pixman_point_fixed_t p2 = { pixman_int_to_fixed (WIDTH), + pixman_int_to_fixed (HEIGHT) }; + pixman_point_fixed_t c_inner; + pixman_point_fixed_t c_outer; + pixman_fixed_t r_inner; + pixman_fixed_t r_outer; + + gtk_init (&argc, &argv); + + for (i = 0; i < WIDTH * HEIGHT; ++i) + src[i] = 0xFF0000ff; /* pale blue */ + + src_img = pixman_image_create_bits (PIXMAN_a8r8g8b8, + WIDTH, HEIGHT, + src, + WIDTH * 4); + + c_inner.x = pixman_double_to_fixed (100.0); + c_inner.y = pixman_double_to_fixed (100.0); + c_outer.x = pixman_double_to_fixed (100.0); + c_outer.y = pixman_double_to_fixed (100.0); + r_inner = 0; + r_outer = pixman_double_to_fixed (100.0); + + gradient_img = pixman_image_create_radial_gradient (&c_inner, &c_outer, + r_inner, r_outer, + stops, 2); + +#if 0 + gradient_img = pixman_image_create_linear_gradient (&p1, &p2, + stops, 2); + +#endif + + pixman_image_composite (PIXMAN_OP_OVER, gradient_img, NULL, src_img, + 0, 0, 0, 0, 0, 0, WIDTH, HEIGHT); + + printf ("0, 0: %x\n", src[0]); + printf ("10, 10: %x\n", src[10 * 10 + 10]); + printf ("w, h: %x\n", src[(HEIGHT - 1) * 100 + (WIDTH - 1)]); + + show_window (src, WIDTH, HEIGHT, WIDTH); + + pixman_image_unref (gradient_img); + pixman_image_unref (src_img); + free (src); + + return 0; +} -- 2.7.4