Removed redundent code block

2013-01-23 11:50:45 +00:00
parent 9a7c9b2a50
commit 6f7570d4ac
1 changed files with 1 additions and 6 deletions
--- a/src/osgPlugins/rgb/ReaderWriterRGB.cpp
+++ b/src/osgPlugins/rgb/ReaderWriterRGB.cpp
@@ -487,13 +487,8 @@ class ReaderWriterRGB : public osgDB::ReaderWriter
                raw->sizeZ == 2 ? GL_LUMINANCE_ALPHA :
                raw->sizeZ == 3 ? GL_RGB :
                raw->sizeZ == 4 ? GL_RGBA : (GLenum)-1;
-        #if 0
-            int internalFormat = raw->sizeZ == 3 ? GL_RGB5 :
-            raw->sizeZ == 4 ? GL_RGB5_A1 : GL_RGB;
-        #else
-            int internalFormat = pixelFormat;
-        #endif

+            int internalFormat = pixelFormat;

            unsigned int dataType = raw->bpc == 1 ? GL_UNSIGNED_BYTE :
              GL_UNSIGNED_SHORT;