pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 configure.ac    |    2 +-
 pixman/pixman.h |   44 ++++++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

New commits:
commit 88e02d36792d3ad2615a775c9d21136c760087ef
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Mon Jun 9 12:32:56 2008 -0400

    Pre-release version bump

diff --git a/configure.ac b/configure.ac
index 98e15a7..f64d4b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 11)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 4)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit fe43a2c1638ee75ca6bbc437a59461cc5c2b6f46
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Mon Jun 9 12:28:05 2008 -0400

    Add back prototypes for pixman_version() and pixman_version_string() to pixman.h

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 8bfbb51..7f74594 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -416,29 +416,33 @@ void                    pixman_region32_reset              (pixman_region32_t *r
 
 
 /* Copy / Fill / Misc */
-pixman_bool_t pixman_blt  (uint32_t *src_bits,
-			   uint32_t *dst_bits,
-			   int       src_stride,
-			   int       dst_stride,
-			   int       src_bpp,
-			   int       dst_bpp,
-			   int       src_x,
-			   int       src_y,
-			   int       dst_x,
-			   int       dst_y,
-			   int       width,
-			   int       height);
-pixman_bool_t pixman_fill (uint32_t *bits,
-			   int       stride,
-			   int       bpp,
-			   int       x,
-			   int       y,
-			   int       width,
-			   int       height,
-			   uint32_t  _xor);
+pixman_bool_t pixman_blt                (uint32_t           *src_bits,
+					 uint32_t           *dst_bits,
+					 int                 src_stride,
+					 int                 dst_stride,
+					 int                 src_bpp,
+					 int                 dst_bpp,
+					 int                 src_x,
+					 int                 src_y,
+					 int                 dst_x,
+					 int                 dst_y,
+					 int                 width,
+					 int                 height);
+pixman_bool_t pixman_fill               (uint32_t           *bits,
+					 int                 stride,
+					 int                 bpp,
+					 int                 x,
+					 int                 y,
+					 int                 width,
+					 int                 height,
+					 uint32_t            _xor);
+
 pixman_bool_t pixman_transform_point_3d (pixman_transform_t *transform,
 					 pixman_vector_t    *vector);
 
+int           pixman_version            (void);
+const char*   pixman_version_string     (void);
+
 /*
  * Images
  */