From 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 3 Aug 2012 08:16:19 +0200
Subject: pixman mesa git update 3 Aug 2012

---
 pixman/configure.ac           | 2 +-
 pixman/pixman/Makefile.am     | 1 +
 pixman/pixman/make-srgb.pl    | 5 ++++-
 pixman/pixman/pixman-matrix.c | 2 +-
 pixman/test/glyph-test.c      | 4 ++--
 pixman/test/stress-test.c     | 5 +++++
 6 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'pixman')

diff --git a/pixman/configure.ac b/pixman/configure.ac
index 36f423ef7..e3a5ff919 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 27)
-m4_define([pixman_micro], 1)
+m4_define([pixman_micro], 3)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/pixman/pixman/Makefile.am b/pixman/pixman/Makefile.am
index deacf8728..843711a25 100644
--- a/pixman/pixman/Makefile.am
+++ b/pixman/pixman/Makefile.am
@@ -13,6 +13,7 @@ noinst_LTLIBRARIES =
 EXTRA_DIST =				\
 	Makefile.win32			\
 	make-combine.pl			\
+	make-srgb.pl			\
 	pixman-combine.c.template	\
 	pixman-combine.h.template	\
 	pixman-region.c			\
diff --git a/pixman/pixman/make-srgb.pl b/pixman/pixman/make-srgb.pl
index ebde2eac6..cdaa80ba5 100644
--- a/pixman/pixman/make-srgb.pl
+++ b/pixman/pixman/make-srgb.pl
@@ -72,7 +72,10 @@ print <<"PROLOG";
 
 #include <stdint.h>
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "pixman-private.h"
 
 PROLOG
diff --git a/pixman/pixman/pixman-matrix.c b/pixman/pixman/pixman-matrix.c
index 6d215ff10..a029ab757 100644
--- a/pixman/pixman/pixman-matrix.c
+++ b/pixman/pixman/pixman-matrix.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <math.h>
diff --git a/pixman/test/glyph-test.c b/pixman/test/glyph-test.c
index 0fb664191..84de5aace 100644
--- a/pixman/test/glyph-test.c
+++ b/pixman/test/glyph-test.c
@@ -199,7 +199,7 @@ create_image (int max_size, const pixman_format_code_t *formats, uint32_t flags)
 	alpha_x = lcg_rand_n (width);
 	alpha_y = lcg_rand_n (height);
 	alpha_map =
-	    create_image (max_size, formats, (flags & ~ALLOW_ALPHA_MAP));
+	    create_image (max_size, formats, (flags & ~(ALLOW_ALPHA_MAP | ALLOW_SOLID)));
 	pixman_image_set_alpha_map (image, alpha_map, alpha_x, alpha_y);
 	pixman_image_unref (alpha_map);
     }
@@ -330,6 +330,6 @@ int
 main (int argc, const char *argv[])
 {
     return fuzzer_test_main ("glyph", 30000,
-			     0x1B7696A2,
+			     0x741CB2DB,
 			     test_glyphs, argc, argv);
 }
diff --git a/pixman/test/stress-test.c b/pixman/test/stress-test.c
index 54ab1c5a9..edcfe0947 100644
--- a/pixman/test/stress-test.c
+++ b/pixman/test/stress-test.c
@@ -468,6 +468,11 @@ set_general_properties (pixman_image_t *image, pixman_bool_t allow_alpha_map)
 		width = lcg_rand_n (image->bits.width) - x + 10;
 		height = lcg_rand_n (image->bits.height) - y + 10;
 
+		if (width + x < x)
+		    width = INT32_MAX - x;
+		if (height + y < y)
+		    height = INT32_MAX - y;
+		
 		pixman_region32_union_rect (
 		    &region, &region, x, y, width, height);
 	    }
-- 
cgit v1.2.3