pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-image.c |    2 +-
 test/fetch-test.c     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c066c347aeaa779b7a3c9e3cde45413277370f0f
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Jan 19 14:23:57 2010 -0500

    Fix some warnings

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 1619165..a4df4e5 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -247,7 +247,7 @@ _pixman_image_validate (pixman_image_t *image)
     }
 
     if (image->common.alpha_map)
-	_pixman_image_validate (image->common.alpha_map);
+	_pixman_image_validate ((pixman_image_t *)image->common.alpha_map);
 }
 
 PIXMAN_EXPORT pixman_bool_t
diff --git a/test/fetch-test.c b/test/fetch-test.c
index c7b32ff..2ca16dd 100644
--- a/test/fetch-test.c
+++ b/test/fetch-test.c
@@ -6,7 +6,7 @@
 
 #define SIZE 1024
 
-static const pixman_indexed_t mono_palette =
+static pixman_indexed_t mono_palette =
 {
     .rgba = { 0x00000000, 0x00ffffff },
 };
@@ -21,7 +21,7 @@ typedef struct {
     pixman_indexed_t *indexed;
 } testcase_t;
 
-static const testcase_t testcases[] =
+static testcase_t testcases[] =
 {
     {
 	.format = PIXMAN_a8r8g8b8,
@@ -100,7 +100,7 @@ static const testcase_t testcases[] =
     },
 };
 
-const int n_test_cases = sizeof(testcases)/sizeof(testcases[0]);
+int n_test_cases = sizeof(testcases)/sizeof(testcases[0]);
 
 
 static uint32_t