From: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed, 19 Sep 2012 23:46:13 +0000 (-0400)
Subject: Fix bug in fast_composite_scaled_nearest()
X-Git-Tag: pixman-0.27.4~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4b69e706e63e01fbc70e0026c2079007c89de14;p=platform%2Fupstream%2Fpixman.git

Fix bug in fast_composite_scaled_nearest()

The fast_composite_scaled_nearest() function can be called when the
format is x8b8g8r8. In that case pixels fetched in fetch_nearest()
need to have their alpha channel set to 0xff.

Fixes test suite failure in scaling-test.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 83c317f..86ed821 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -1458,7 +1458,7 @@ fetch_nearest (pixman_repeat_t src_repeat,
 {
     if (repeat (src_repeat, &x, src_width))
     {
-	if (format == PIXMAN_x8r8g8b8)
+	if (format == PIXMAN_x8r8g8b8 || format == PIXMAN_x8b8g8r8)
 	    return *(src + x) | 0xff000000;
 	else
 	    return *(src + x);