pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 README                |    9 ++++-----
 pixman/pixman-image.c |    9 +++++++++
 pixman/pixman.h       |    1 +
 test/Makefile.am      |    3 +--
 4 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 526132fa652a42d94826760aa9c72537e3ecaf35
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Thu Apr 22 12:14:23 2010 -0400

    Remove alphamap from the GTK+ part of tests/Makefile.am
    
    It doesn't use GTK+ and it was already listed in the non-GTK+ part.

diff --git a/test/Makefile.am b/test/Makefile.am
index 841ff8d..4ef6b45 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -47,8 +47,7 @@ TESTPROGRAMS_GTK =		\
 	alpha-test		\
 	screen-test		\
 	convolution-test	\
-	trap-test		\
-	alphamap
+	trap-test
 
 INCLUDES += $(GTK_CFLAGS)
 
commit 8f7cc5e4388e83eb1b77aea978f3c58338232320
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Wed Apr 21 09:59:29 2010 -0400

    Add pixman_image_get_format() accessor

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 9b44aa9..9604bfe 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -739,6 +739,15 @@ pixman_image_get_depth (pixman_image_t *image)
     return 0;
 }
 
+PIXMAN_EXPORT pixman_format_code_t
+pixman_image_get_format (pixman_image_t *image)
+{
+    if (image->type == BITS)
+	return image->bits.format;
+
+    return 0;
+}
+
 uint32_t
 _pixman_image_get_solid (pixman_image_t *     image,
                          pixman_format_code_t format)
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 964d04a..7b95fed 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -778,6 +778,7 @@ int		pixman_image_get_width               (pixman_image_t               *image);
 int             pixman_image_get_height              (pixman_image_t               *image);
 int		pixman_image_get_stride              (pixman_image_t               *image); /* in bytes */
 int		pixman_image_get_depth               (pixman_image_t		   *image);
+pixman_format_code_t pixman_image_get_format	     (pixman_image_t		   *image);
 pixman_bool_t	pixman_image_fill_rectangles	     (pixman_op_t		    op,
 						      pixman_image_t		   *image,
 						      pixman_color_t		   *color,
commit 2b1cae1ef62289288ef00ea7cc1dfef8e01750e6
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Wed Apr 21 09:55:35 2010 -0400

    Some minor updates to README

diff --git a/README b/README
index 60dff45..4497cb2 100644
--- a/README
+++ b/README
@@ -1,15 +1,15 @@
 pixman is a library that provides low-level pixel manipulation
 features such as image compositing and trapezoid rasterization.
 
-Please submit bugs & patches to the libpixman bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=pixman
-
 All questions regarding this software should be directed to the pixman
 mailing list:
 
         http://lists.freedesktop.org/mailman/listinfo/pixman
 
+Please submit bugs and patches to the freedesktop bug tracker:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=pixman
+
 The master development code repository can be found at:
 
 	git://anongit.freedesktop.org/git/pixman
@@ -19,4 +19,3 @@ The master development code repository can be found at:
 For more information on the git code manager, see:
 
 	http://wiki.x.org/wiki/GitPage
-