pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 test/Makefile.am |    4 ++++
 test/clip-in.c   |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

New commits:
commit aa234489b0653ef63cf1b3d162aa7a339779c4da
Merge: 7a9bfa1... 010e286...
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sat May 16 12:51:05 2009 -0400

    Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/pixman

commit 7a9bfa146154e555a9e2e8a807bb7df2b30f860c
Merge: 81b94d7... e17fc72...
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed May 13 13:10:01 2009 -0400

    Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/pixman

commit 81b94d725834d03f7856ae0d505a7340f1135326
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed May 13 13:09:45 2009 -0400

    Add test that shows difference in clipping with transformed vs untransformed

diff --git a/test/Makefile.am b/test/Makefile.am
index 39e3222..cb8a5ef 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,6 +20,7 @@ GTK_LDADD = $(TEST_LDADD) $(GTK_LIBS)
 
 TESTPROGRAMS +=			\
 	clip-test		\
+	clip-in			\
 	composite-test		\
 	gradient-test		\
 	trap-test
@@ -37,6 +38,9 @@ composite_test_SOURCES = composite-test.c utils.c utils.h
 clip_test_LDADD = $(GTK_LDADD)
 clip_test_SOURCES = clip-test.c utils.c utils.h
 
+clip_in_LDADD = $(GTK_LDADD)
+clip_in_SOURCES = clip-in.c utils.c utils.h
+
 trap_test_LDADD = $(GTK_LDADD)
 trap_test_SOURCES = trap-test.c utils.c utils.h
 
diff --git a/test/clip-in.c b/test/clip-in.c
new file mode 100644
index 0000000..55459b2
--- /dev/null
+++ b/test/clip-in.c
@@ -0,0 +1,50 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "pixman.h"
+#include "utils.h"
+
+/* This test demonstrates that clipping is done totally different depending
+ * on whether the source is transformed or not.
+ */
+int
+main (int argc, char **argv)
+{
+#define WIDTH 200
+#define HEIGHT 200
+
+#define SMALL 25
+    
+    uint32_t *sbits = malloc (SMALL * SMALL * 4);
+    uint32_t *bits = malloc (WIDTH * HEIGHT * 4);
+    pixman_transform_t trans = {
+    {
+	{ pixman_double_to_fixed (1.0), pixman_double_to_fixed (0), pixman_double_to_fixed (-0.1), },
+	{ pixman_double_to_fixed (0), pixman_double_to_fixed (1), pixman_double_to_fixed (-0.1), },
+	{ pixman_double_to_fixed (0), pixman_double_to_fixed (0), pixman_double_to_fixed (1.0) }
+    } };
+	  
+    pixman_image_t *src_img = pixman_image_create_bits (PIXMAN_a8r8g8b8, SMALL, SMALL, sbits, 4 * SMALL);
+    pixman_image_t *dest_img = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, bits, 4 * WIDTH);
+
+    memset (bits, 0xff, WIDTH * HEIGHT * 4);
+    memset (sbits, 0x00, SMALL * SMALL * 4);
+
+    pixman_image_composite (PIXMAN_OP_IN,
+			    src_img, NULL, dest_img,
+			    0, 0, 0, 0, SMALL, SMALL, 200, 200);
+    
+    pixman_image_set_transform (src_img, &trans);
+    
+    pixman_image_composite (PIXMAN_OP_IN,
+			    src_img, NULL, dest_img,
+			    0, 0, 0, 0, SMALL * 2, SMALL * 2, 200, 200);
+    
+    show_image (dest_img);
+    
+    pixman_image_unref (src_img);
+    pixman_image_unref (dest_img);
+    free (bits);
+    
+    return 0;
+}