FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement a simply attempt at detecting when the pixel format needs to be swapped.

Browse Source
This commit is contained in:
Robert Osfield
2011-10-26 09:34:50 +00:00
parent 2dc271d85f
commit b9d7989b44
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgPlugins/vnc/ReaderWriterVNC.cpp
View File

@@ -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());