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

From David Spilling, "Given no replies to my recent "does anybody use the DDS writer" query, I was emboldened to submit this very small patch. The bitmasks for RGBA and RGB have been modified in the writer portion of the code (line 765 onwards). This is now consistent with what the DDS plugin reads. In terms of testing, note that many 3rd party applications erroneously ignore the bitmasks in the file, and assume a BGRA order."

Browse Source
This commit is contained in:
Robert Osfield
2007-09-15 17:36:03 +00:00
parent 8051c48e56
commit e433762105
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/dds/ReaderWriterDDS.cpp
View File

@@ -764,9 +764,9 @@ bool WriteDDSFile(const osg::Image *img, std::ostream& fout)
//Uncompressed
case GL_RGBA:
{
ddpf.dwRBitMask = 0x00ff0000;
ddpf.dwRBitMask = 0x000000ff;
ddpf.dwGBitMask = 0x0000ff00;
ddpf.dwBBitMask = 0x000000ff;
ddpf.dwBBitMask = 0x00ff0000;
ddpf.dwRGBAlphaBitMask = 0xff000000;
PF_flags |= (DDPF_ALPHAPIXELS | DDPF_RGB);
ddpf.dwRGBBitCount = pixelSize;
@@ -776,9 +776,9 @@ bool WriteDDSFile(const osg::Image *img, std::ostream& fout)
break;
case GL_BGRA:
{
ddpf.dwBBitMask = 0x00ff0000;
ddpf.dwBBitMask = 0x000000ff;
ddpf.dwGBitMask = 0x0000ff00;
ddpf.dwRBitMask = 0x000000ff;
ddpf.dwRBitMask = 0x00ff0000;
ddpf.dwRGBAlphaBitMask = 0xff000000;
PF_flags |= (DDPF_ALPHAPIXELS | DDPF_RGB);
ddpf.dwRGBBitCount = pixelSize;
@@ -798,9 +798,9 @@ bool WriteDDSFile(const osg::Image *img, std::ostream& fout)
break;
case GL_RGB:
{
ddpf.dwRBitMask = 0x00ff0000;
ddpf.dwGBitMask = 0x0000ff00;
ddpf.dwBBitMask = 0x000000ff;
ddpf.dwRBitMask = 0x000000ff;
ddpf.dwGBitMask = 0x0000ff00;
ddpf.dwBBitMask = 0x00ff0000;
PF_flags |= DDPF_RGB;
ddpf.dwRGBBitCount = pixelSize;
ddsd.lPitch = img->getRowSizeInBytes();