pixman: Branch 'master' - 2 commits

[Siarhei Siamashka]

 pixman/pixman-compiler.h |    4 ++++
 pixman/pixman-glyph.c    |    2 +-
 pixman/pixman-image.c    |    2 +-
 pixman/pixman-region.c   |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1abde88ae60ae0877073d85cbf5b39013337f5da
Author: Siarhei Siamashka <siarhei.siamashka at gmail.com>
Date:   Thu Dec 20 05:14:39 2012 +0200

    Use more appropriate types and remove a magic constant

diff --git a/pixman/pixman-glyph.c b/pixman/pixman-glyph.c
index 15b3f1f..6d2c8bb 100644
--- a/pixman/pixman-glyph.c
+++ b/pixman/pixman-glyph.c
@@ -508,7 +508,7 @@ add_glyphs (pixman_glyph_cache_t *cache,
     uint32_t glyph_flags = 0;
     pixman_composite_func_t func = NULL;
     pixman_implementation_t *implementation = NULL;
-    uint32_t dest_format;
+    pixman_format_code_t dest_format;
     uint32_t dest_flags;
     pixman_box32_t dest_box;
     pixman_composite_info_t info;
diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 6f076d5..65041b4 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -888,7 +888,7 @@ pixman_image_get_format (pixman_image_t *image)
     if (image->type == BITS)
 	return image->bits.format;
 
-    return 0;
+    return PIXMAN_null;
 }
 
 uint32_t
diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index 8955fe7..2d6f157 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -202,7 +202,7 @@ PIXREGION_SZOF (size_t n)
     return size + sizeof(region_data_type_t);
 }
 
-static void *
+static region_data_type_t *
 alloc_data (size_t n)
 {
     size_t sz = PIXREGION_SZOF (n);
commit c1fd5a42439b21872170979d8c400cbb374e1f9d
Author: Siarhei Siamashka <siarhei.siamashka at gmail.com>
Date:   Thu Dec 20 05:00:46 2012 +0200

    Define SIZE_MAX if it is not provided by the standard C headers
    
    C++ compilers do not define SIZE_MAX. It is also not available
    if the code is compiled by some C compilers:
        http://lists.freedesktop.org/archives/pixman/2012-August/002196.html

diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
index a978acc..2e45dea 100644
--- a/pixman/pixman-compiler.h
+++ b/pixman/pixman-compiler.h
@@ -56,6 +56,10 @@
 # define INT64_MAX              (9223372036854775807)
 #endif
 
+#ifndef SIZE_MAX
+# define SIZE_MAX               ((size_t)-1)
+#endif
+
 
 #ifndef M_PI
 # define M_PI			3.14159265358979323846