Changeset 10264

Timestamp:

05/25/09 13:12:38 (4 years ago)

Author:

robert

Message:

From Wojciech Lewandowski, "Two fixes for LUMINANCE and ALPHA_LUMINACE pixel formats written into DDS file. Component masks were incorrect. I tested results with ultimate DDS compatibitlity tester ie Microsoft DirectX Texture tool ;-). I have also added comment with warning about possible problems when writing other than 8 bit component pixel formats.
"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dds/ReaderWriterDDS.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dds/ReaderWriterDDS.cpp

@@ -10 +10 @@
 *                    Author: Sebastien Domine, NVIDIA Corporation
 *
-*    CREATED BY:        Rune Schmidt Jensen, rsj@uni-dk
+*    CREATED BY:     Rune Schmidt Jensen, rsj@uni-dk
 *
 *    HISTORY:        Created   31.03.2003
 *             Modified  13.05.2004
 *                by George Tarantilis, gtaranti@nps.navy.mil
+*             Modified  22.05.2009 
+*                Wojtek Lewandowski, lewandowski@ai.com.pl 
+*
+*    WARNING: 
+*          Bit Masks in the WrtiteDDS are set for 8 bit components 
+*          write with 4 or 16 bit components will 
+*          probably produce corrupted file 
+*          Wojtek Lewandowski 2009-05-22 
 *
 **********************************************************************/
@@ -717 +725 @@
 
 
-
-
-
-
 bool WriteDDSFile(const osg::Image *img, std::ostream& fout)
 {
@@ -794 +798 @@
     case GL_LUMINANCE_ALPHA:
         {
-            ddpf.dwRBitMask         = 0x00ff0000;
-            ddpf.dwRGBAlphaBitMask  = 0x000000ff;
+            ddpf.dwRBitMask         = 0x000000ff;
+            ddpf.dwRGBAlphaBitMask  = 0x0000ff00;
             PF_flags |= (DDPF_ALPHAPIXELS | DDPF_LUMINANCE);  
             ddpf.dwRGBBitCount = pixelSize; 
@@ -815 +819 @@
     case GL_LUMINANCE:
         {
-            ddpf.dwRBitMask         = 0x00ff0000;
+            ddpf.dwRBitMask         = 0x000000ff;
             PF_flags |= DDPF_LUMINANCE;
             ddpf.dwRGBBitCount = pixelSize;