From b9d7989b44e688839af1efa42fcedb7751af1b7a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 26 Oct 2011 09:34:50 +0000
Subject: [PATCH] Implement a simply attempt at detecting when the pixel format
 needs to be swapped.

---
 src/osgPlugins/vnc/ReaderWriterVNC.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/osgPlugins/vnc/ReaderWriterVNC.cpp b/src/osgPlugins/vnc/ReaderWriterVNC.cpp
index 7c0c92308..55cf4eabd 100644
--- a/src/osgPlugins/vnc/ReaderWriterVNC.cpp
+++ b/src/osgPlugins/vnc/ReaderWriterVNC.cpp
@@ -89,7 +89,7 @@ class LibVncImage : public osgWidget::VncImage
 
                         if(i)
                         {
-                            OSG_NOTICE<<"Handling "<<i<<" messages"<<std::endl;
+                            OSG_INFO<<"VNC Handling "<<i<<" messages"<<std::endl;
                         
                             if(!HandleRFBServerMessage(_client))
                             return;
@@ -260,13 +260,20 @@ rfbBool LibVncImage::resizeImage(rfbClient* client)
 {
     osg::Image* image = (osg::Image*)(rfbClientGetClientData(client, 0));
     
-    int width=client->width;
-    int height=client->height;
-    int depth=client->format.bitsPerPixel;
+    int width = client->width;
+    int height = client->height;
+    int depth = client->format.bitsPerPixel;
 
     OSG_NOTICE<<"resize "<<width<<", "<<height<<", "<<depth<<" image = "<<image<<std::endl;
+    PrintPixelFormat(&(client->format));
+
+    bool swap = client->format.redShift!=0;
+    GLenum gl_pixelFormat = swap ? GL_BGRA : GL_RGBA;
+
+    image->allocateImage(width, height, 1, gl_pixelFormat, GL_UNSIGNED_BYTE);
+    image->setInternalTextureFormat(GL_RGBA);
+
 
-    image->allocateImage(width,height,1,GL_RGBA,GL_UNSIGNED_BYTE);
     
     client->frameBuffer= (uint8_t*)(image->data());