From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 6 May 2008 11:13:58 +0000 (+0100)
Subject: merge from in qemu upstream: "Attempt to fix incorrect colours on some BGR displays... 
X-Git-Tag: xen-3.3.0-rc1~208
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=56c9f64676e4dcd33c383e2d7a6c7ebedefe07ce;p=qemu-xen-3.4-testing.git

merge from in qemu upstream: "Attempt to fix incorrect colours on some BGR displays"; slightly better determination of ds->bgr
---

diff --git a/sdl.c b/sdl.c
index 8fe968fa..2911c9be 100644
--- a/sdl.c
+++ b/sdl.c
@@ -245,7 +245,7 @@ static void sdl_resize(DisplayState *ds, int w, int h, int linesize)
     ds->height = h;
     if (!ds->shared_buf) {
         ds->depth = screen->format->BitsPerPixel;
-        if (ds->depth == 32 && screen->format->Rshift == 0) {
+	if (screen->format->Bshift > screen->format->Rshift) {
             ds->bgr = 1;
         } else {
             ds->bgr = 0;