pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-bits-image.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 384846b38cfb5e1895ae49c40adbf72a85b63d95
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Sun Aug 19 13:45:21 2012 -0400

    Remove pointless declaration of _pixman_image_get_scanline_generic_64()
    
    This declaration used to be necessary when
    _pixman_image_get_scanline_generic_64() referred to a structure that
    itself referred back to _pixman_image_get_scanline_generic_64().

diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index b6c8630..c69e151 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -1123,10 +1123,6 @@ bits_image_fetch_untransformed_64 (pixman_iter_t * iter,
     return buffer;
 }
 
-static uint32_t *
-_pixman_image_get_scanline_generic_64 (pixman_iter_t   *iter,
-				       const uint32_t * mask);
-
 typedef struct
 {
     pixman_format_code_t	format;