pixman git update 21/9/2010

1 files changed, 191 insertions, 192 deletions

diff --git a/pixman/test/composite-test.c b/pixman/test/composite-test.c
index 5401abfdf..79d5d5eac 100644
--- a/pixman/test/composite-test.c
+++ b/pixman/test/composite-test.c
@@ -1,192 +1,191 @@
-#include <gtk/gtk.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "pixman.h"
-#include "gtk-utils.h"
-
-#define WIDTH	60
-#define HEIGHT	60
-
-typedef struct {
-    const char *name;
-    pixman_op_t op;
-} operator_t;
-
-static const operator_t operators[] = {
-    { "CLEAR",		PIXMAN_OP_CLEAR },
-    { "SRC",		PIXMAN_OP_SRC },
-    { "DST",		PIXMAN_OP_DST },
-    { "OVER",		PIXMAN_OP_OVER },
-    { "OVER_REVERSE",	PIXMAN_OP_OVER_REVERSE },
-    { "IN",		PIXMAN_OP_IN },
-    { "IN_REVERSE",	PIXMAN_OP_IN_REVERSE },
-    { "OUT",		PIXMAN_OP_OUT },
-    { "OUT_REVERSE",	PIXMAN_OP_OUT_REVERSE },
-    { "ATOP",		PIXMAN_OP_ATOP },
-    { "ATOP_REVERSE",	PIXMAN_OP_ATOP_REVERSE },
-    { "XOR",		PIXMAN_OP_XOR },
-    { "ADD",		PIXMAN_OP_ADD },
-    { "SATURATE",	PIXMAN_OP_SATURATE },
-
-    { "MULTIPLY",	PIXMAN_OP_MULTIPLY },
-    { "SCREEN",		PIXMAN_OP_SCREEN },
-    { "OVERLAY",	PIXMAN_OP_OVERLAY },
-    { "DARKEN",		PIXMAN_OP_DARKEN },
-    { "LIGHTEN",	PIXMAN_OP_LIGHTEN },
-    { "COLOR_DODGE",	PIXMAN_OP_COLOR_DODGE },
-    { "COLOR_BURN",	PIXMAN_OP_COLOR_BURN },
-    { "HARD_LIGHT",	PIXMAN_OP_HARD_LIGHT },
-    { "SOFT_LIGHT",	PIXMAN_OP_SOFT_LIGHT },
-    { "DIFFERENCE",	PIXMAN_OP_DIFFERENCE },
-    { "EXCLUSION",	PIXMAN_OP_EXCLUSION },
-    { "HSL_HUE",	PIXMAN_OP_HSL_HUE },
-    { "HSL_SATURATION",	PIXMAN_OP_HSL_SATURATION },
-    { "HSL_COLOR",	PIXMAN_OP_HSL_COLOR },
-    { "HSL_LUMINOSITY",	PIXMAN_OP_HSL_LUMINOSITY },
-};
-
-static uint32_t
-reader (const void *src, int size)
-{
-    switch (size)
-    {
-    case 1:
-	return *(uint8_t *)src;
-    case 2:
-	return *(uint16_t *)src;
-    case 4:
-	return *(uint32_t *)src;
-    default:
-	g_assert_not_reached();
-    }
-}
-
-static void
-writer (void *src, uint32_t value, int size)
-{
-    switch (size)
-    {
-    case 1:
-	*(uint8_t *)src = value;
-	break;
-
-    case 2:
-	*(uint16_t *)src = value;
-	break;
-
-    case 4:
-	*(uint32_t *)src = value;
-	break;
-
-    default:
-        break;
-    }
-}
-
-int
-main (int argc, char **argv)
-{
-#define d2f pixman_double_to_fixed
-    
-    GtkWidget *window, *swindow;
-    GtkWidget *table;
-    uint32_t *dest = malloc (WIDTH * HEIGHT * 4);
-    uint32_t *src = malloc (WIDTH * HEIGHT * 4);
-    pixman_image_t *src_img;
-    pixman_image_t *dest_img;
-    pixman_point_fixed_t p1 = { -10 << 0, 0 };
-    pixman_point_fixed_t p2 = { WIDTH << 16, (HEIGHT - 10) << 16 };
-    uint16_t full = 0xcfff;
-    uint16_t low  = 0x5000;
-    uint16_t alpha = 0xffff;
-    pixman_gradient_stop_t stops[6] =
-    {
-	{ d2f (0.0), { full, low, low, alpha } },
-	{ d2f (0.25), { full, full, low, alpha } },
-	{ d2f (0.4), { low, full, low, alpha } },
-	{ d2f (0.5), { low, full, full, alpha } },
-	{ d2f (0.8), { low, low, full, alpha } },
-	{ d2f (1.0), { full, low, full, alpha } },
-    };
-	
-	    
-    int i;
-
-    gtk_init (&argc, &argv);
-
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-    gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-    
-    g_signal_connect (window, "delete-event",
-		      G_CALLBACK (gtk_main_quit),
-		      NULL);
-    table = gtk_table_new (G_N_ELEMENTS (operators) / 6, 6, TRUE);
-
-    src_img = pixman_image_create_linear_gradient (&p1, &p2, stops,
-						   sizeof (stops) / sizeof (stops[0]));
-
-    pixman_image_set_repeat (src_img, PIXMAN_REPEAT_PAD);
-    
-    dest_img = pixman_image_create_bits (PIXMAN_a8r8g8b8,
-					 WIDTH, HEIGHT,
-					 dest,
-					 WIDTH * 4);
-    pixman_image_set_accessors (dest_img, reader, writer);
-
-    for (i = 0; i < G_N_ELEMENTS (operators); ++i)
-    {
-	GtkWidget *image;
-	GdkPixbuf *pixbuf;
-	GtkWidget *vbox;
-	GtkWidget *label;
-	int j, k;
-
-	vbox = gtk_vbox_new (FALSE, 0);
-
-	label = gtk_label_new (operators[i].name);
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
-	gtk_widget_show (label);
-
-	for (j = 0; j < HEIGHT; ++j)
-	{
-	    for (k = 0; k < WIDTH; ++k)
-		dest[j * WIDTH + k] = 0x7f6f6f00;
-	}
-	pixman_image_composite (operators[i].op, src_img, NULL, dest_img,
-				0, 0, 0, 0, 0, 0, WIDTH, HEIGHT);
-	pixbuf = pixbuf_from_argb32 (pixman_image_get_data (dest_img), TRUE,
-				     WIDTH, HEIGHT, WIDTH * 4);
-	image = gtk_image_new_from_pixbuf (pixbuf);
-	gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
-	gtk_widget_show (image);
-
-	gtk_table_attach_defaults (GTK_TABLE (table), vbox,
-				   i % 6, (i % 6) + 1, i / 6, (i / 6) + 1);
-	gtk_widget_show (vbox);
-
-	g_object_unref (pixbuf);
-    }
-
-    pixman_image_unref (src_img);
-    free (src);
-    pixman_image_unref (dest_img);
-    free (dest);
-
-    swindow = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
-				    GTK_POLICY_AUTOMATIC,
-				    GTK_POLICY_AUTOMATIC);
-    
-    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swindow), table);
-    gtk_widget_show (table);
-
-    gtk_container_add (GTK_CONTAINER (window), swindow);
-    gtk_widget_show (swindow);
-
-    gtk_widget_show (window);
-
-    gtk_main ();
-
-    return 0;
-}
+#include <gtk/gtk.h>

+#include <stdlib.h>

+#include <stdio.h>

+#include "pixman.h"

+#include "gtk-utils.h"

+

+#define WIDTH	60

+#define HEIGHT	60

+

+typedef struct {

+    const char *name;

+    pixman_op_t op;

+} operator_t;

+

+static const operator_t operators[] = {

+    { "CLEAR",		PIXMAN_OP_CLEAR },

+    { "SRC",		PIXMAN_OP_SRC },

+    { "DST",		PIXMAN_OP_DST },

+    { "OVER",		PIXMAN_OP_OVER },

+    { "OVER_REVERSE",	PIXMAN_OP_OVER_REVERSE },

+    { "IN",		PIXMAN_OP_IN },

+    { "IN_REVERSE",	PIXMAN_OP_IN_REVERSE },

+    { "OUT",		PIXMAN_OP_OUT },

+    { "OUT_REVERSE",	PIXMAN_OP_OUT_REVERSE },

+    { "ATOP",		PIXMAN_OP_ATOP },

+    { "ATOP_REVERSE",	PIXMAN_OP_ATOP_REVERSE },

+    { "XOR",		PIXMAN_OP_XOR },

+    { "ADD",		PIXMAN_OP_ADD },

+    { "SATURATE",	PIXMAN_OP_SATURATE },

+

+    { "MULTIPLY",	PIXMAN_OP_MULTIPLY },

+    { "SCREEN",		PIXMAN_OP_SCREEN },

+    { "OVERLAY",	PIXMAN_OP_OVERLAY },

+    { "DARKEN",		PIXMAN_OP_DARKEN },

+    { "LIGHTEN",	PIXMAN_OP_LIGHTEN },

+    { "COLOR_DODGE",	PIXMAN_OP_COLOR_DODGE },

+    { "COLOR_BURN",	PIXMAN_OP_COLOR_BURN },

+    { "HARD_LIGHT",	PIXMAN_OP_HARD_LIGHT },

+    { "SOFT_LIGHT",	PIXMAN_OP_SOFT_LIGHT },

+    { "DIFFERENCE",	PIXMAN_OP_DIFFERENCE },

+    { "EXCLUSION",	PIXMAN_OP_EXCLUSION },

+    { "HSL_HUE",	PIXMAN_OP_HSL_HUE },

+    { "HSL_SATURATION",	PIXMAN_OP_HSL_SATURATION },

+    { "HSL_COLOR",	PIXMAN_OP_HSL_COLOR },

+    { "HSL_LUMINOSITY",	PIXMAN_OP_HSL_LUMINOSITY },

+};

+

+static uint32_t

+reader (const void *src, int size)

+{

+    switch (size)

+    {

+    case 1:

+	return *(uint8_t *)src;

+    case 2:

+	return *(uint16_t *)src;

+    case 4:

+	return *(uint32_t *)src;

+    default:

+	g_assert_not_reached();

+    }

+}

+

+static void

+writer (void *src, uint32_t value, int size)

+{

+    switch (size)

+    {

+    case 1:

+	*(uint8_t *)src = value;

+	break;

+

+    case 2:

+	*(uint16_t *)src = value;

+	break;

+

+    case 4:

+	*(uint32_t *)src = value;

+	break;

+

+    default:

+        break;

+    }

+}

+

+int

+main (int argc, char **argv)

+{

+#define d2f pixman_double_to_fixed

+    

+    GtkWidget *window, *swindow;

+    GtkWidget *table;

+    uint32_t *dest = malloc (WIDTH * HEIGHT * 4);

+    uint32_t *src = malloc (WIDTH * HEIGHT * 4);

+    pixman_image_t *src_img;

+    pixman_image_t *dest_img;

+    pixman_point_fixed_t p1 = { -10 << 0, 0 };

+    pixman_point_fixed_t p2 = { WIDTH << 16, (HEIGHT - 10) << 16 };

+    uint16_t full = 0xcfff;

+    uint16_t low  = 0x5000;

+    uint16_t alpha = 0xffff;

+    pixman_gradient_stop_t stops[6] =

+    {

+	{ d2f (0.0), { full, low, low, alpha } },

+	{ d2f (0.25), { full, full, low, alpha } },

+	{ d2f (0.4), { low, full, low, alpha } },

+	{ d2f (0.6), { low, full, full, alpha } },

+	{ d2f (0.8), { low, low, full, alpha } },

+	{ d2f (1.0), { full, low, full, alpha } },

+    };

+

+    int i;

+

+    gtk_init (&argc, &argv);

+

+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

+

+    gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);

+    

+    g_signal_connect (window, "delete-event",

+		      G_CALLBACK (gtk_main_quit),

+		      NULL);

+    table = gtk_table_new (G_N_ELEMENTS (operators) / 6, 6, TRUE);

+

+    src_img = pixman_image_create_linear_gradient (&p1, &p2, stops,

+						   sizeof (stops) / sizeof (stops[0]));

+

+    pixman_image_set_repeat (src_img, PIXMAN_REPEAT_PAD);

+    

+    dest_img = pixman_image_create_bits (PIXMAN_a8r8g8b8,

+					 WIDTH, HEIGHT,

+					 dest,

+					 WIDTH * 4);

+    pixman_image_set_accessors (dest_img, reader, writer);

+

+    for (i = 0; i < G_N_ELEMENTS (operators); ++i)

+    {

+	GtkWidget *image;

+	GdkPixbuf *pixbuf;

+	GtkWidget *vbox;

+	GtkWidget *label;

+	int j, k;

+

+	vbox = gtk_vbox_new (FALSE, 0);

+

+	label = gtk_label_new (operators[i].name);

+	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);

+	gtk_widget_show (label);

+

+	for (j = 0; j < HEIGHT; ++j)

+	{

+	    for (k = 0; k < WIDTH; ++k)

+		dest[j * WIDTH + k] = 0x7f6f6f00;

+	}

+	pixman_image_composite (operators[i].op, src_img, NULL, dest_img,

+				0, 0, 0, 0, 0, 0, WIDTH, HEIGHT);

+	pixbuf = pixbuf_from_argb32 (pixman_image_get_data (dest_img), TRUE,

+				     WIDTH, HEIGHT, WIDTH * 4);

+	image = gtk_image_new_from_pixbuf (pixbuf);

+	gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);

+	gtk_widget_show (image);

+

+	gtk_table_attach_defaults (GTK_TABLE (table), vbox,

+				   i % 6, (i % 6) + 1, i / 6, (i / 6) + 1);

+	gtk_widget_show (vbox);

+

+	g_object_unref (pixbuf);

+    }

+

+    pixman_image_unref (src_img);

+    free (src);

+    pixman_image_unref (dest_img);

+    free (dest);

+

+    swindow = gtk_scrolled_window_new (NULL, NULL);

+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),

+				    GTK_POLICY_AUTOMATIC,

+				    GTK_POLICY_AUTOMATIC);

+    

+    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swindow), table);

+    gtk_widget_show (table);

+

+    gtk_container_add (GTK_CONTAINER (window), swindow);

+    gtk_widget_show (swindow);

+

+    gtk_widget_show (window);

+

+    gtk_main ();

+

+    return 0;

+}