pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-compose.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 64e3146c5ddfad415663fa5f87f7b9ff327a8c56 (from 8216ba1cbd27c5428970b8d393722d0f4343efed)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Jun 22 00:58:05 2007 -0400

    Don't treat void as a value. Bug 11322, Alan Coopersmith.

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index 24402da..e336e04 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -4459,11 +4459,11 @@ pixman_composite_rect_general (const FbC
 	data->dest->common.read_func			||
 	data->dest->common.write_func)
     {
-	return pixman_composite_rect_general_accessors (data, scanline_buffer);
+	pixman_composite_rect_general_accessors (data, scanline_buffer);
     }
     else
     {
-	return pixman_composite_rect_general_no_accessors (data, scanline_buffer);
+	pixman_composite_rect_general_no_accessors (data, scanline_buffer);
     }
 }