Changeset 13041 for OpenSceneGraph/trunk/src/osg/Image.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/Image.cpp (modified) (53 diffs)

OpenSceneGraph/trunk/src/osg/Image.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -112 +112 @@
         // advance to next row
         ++_rowNum;
-        
+
         if (_rowNum>=_image->t())
         {
@@ -128 +128 @@
         }
     }
-   
+
     assign();
 }
@@ -141 +141 @@
         return;
     }
-    
+
     //OSG_NOTICE<<"DataIterator::assign B"<<std::endl;
 
@@ -154 +154 @@
         return;
     }
-    
+
     //OSG_NOTICE<<"DataIterator::assign C"<<std::endl;
 
@@ -168 +168 @@
         }
         const unsigned char* ptr = _image->getMipmapData(_mipmapNum);
-        
+
         int rowLength = _image->getRowLength()>>_mipmapNum;
         if (rowLength==0) rowLength = 1;
-        
+
         int imageHeight = _image->t()>>_mipmapNum;
         if (imageHeight==0) imageHeight = 1;
-        
+
         unsigned int rowWidthInBytes = Image::computeRowWidthInBytes(rowLength,_image->getPixelFormat(),_image->getDataType(),_image->getPacking());
         unsigned int imageSizeInBytes = rowWidthInBytes*imageHeight;
-        
+
         _currentPtr = ptr + rowWidthInBytes*_rowNum + imageSizeInBytes*_imageNum;
         _currentSize = rowWidthInBytes;
@@ -216 +216 @@
     _data(0L)
 {
-    setDataVariance(STATIC); 
+    setDataVariance(STATIC);
 }
 
@@ -288 +288 @@
 
     // slowest comparison at the bottom!
-    COMPARE_StateAttribute_Parameter(getFileName())    
+    COMPARE_StateAttribute_Parameter(getFileName())
 
     return 0;
@@ -323 +323 @@
         case(GL_UNSIGNED_INT_2_10_10_10_REV): return true;
         default: return false;
-    }    
+    }
 }
 
@@ -370 +370 @@
         case(GL_INTENSITY16UI_EXT):
         case(GL_INTENSITY32UI_EXT):
-            OSG_WARN<<"Image::computePixelFormat("<<std::hex<<format<<std::dec<<") intensity pixel format is not correctly specified, so assume GL_LUMINANCE_INTEGER."<<std::endl;            
+            OSG_WARN<<"Image::computePixelFormat("<<std::hex<<format<<std::dec<<") intensity pixel format is not correctly specified, so assume GL_LUMINANCE_INTEGER."<<std::endl;
             return GL_LUMINANCE_INTEGER_EXT;
         case(GL_LUMINANCE_ALPHA8I_EXT):
@@ -404 +404 @@
     {
         case GL_LUMINANCE32F_ARB:
-        case GL_LUMINANCE16F_ARB: 
+        case GL_LUMINANCE16F_ARB:
         case GL_LUMINANCE_ALPHA32F_ARB:
-        case GL_LUMINANCE_ALPHA16F_ARB: 
+        case GL_LUMINANCE_ALPHA16F_ARB:
         case GL_RGB32F_ARB:
-        case GL_RGB16F_ARB: 
+        case GL_RGB16F_ARB:
         case GL_RGBA32F_ARB:
         case GL_RGBA16F_ARB: return GL_FLOAT;
@@ -419 +419 @@
         case GL_RGB16UI_EXT:
         case GL_RGBA16UI_EXT:
-        case GL_LUMINANCE16UI_EXT: 
+        case GL_LUMINANCE16UI_EXT:
         case GL_LUMINANCE_ALPHA16UI_EXT: return GL_UNSIGNED_SHORT;
 
@@ -427 +427 @@
         case GL_LUMINANCE_ALPHA8UI_EXT:  return GL_UNSIGNED_BYTE;
 
-        case GL_RGBA32I_EXT:  
+        case GL_RGBA32I_EXT:
         case GL_RGB32I_EXT:
         case GL_LUMINANCE32I_EXT:
@@ -437 +437 @@
         case GL_LUMINANCE_ALPHA16I_EXT: return GL_SHORT;
 
-        case GL_RGB8I_EXT: 
-        case GL_RGBA8I_EXT: 
-        case GL_LUMINANCE8I_EXT: 
+        case GL_RGB8I_EXT:
+        case GL_RGBA8I_EXT:
+        case GL_LUMINANCE8I_EXT:
         case GL_LUMINANCE_ALPHA8I_EXT: return GL_BYTE;
 
@@ -448 +448 @@
         case GL_ALPHA: return GL_UNSIGNED_BYTE;
 
-        default: 
+        default:
         {
             OSG_WARN<<"error computeFormatType = "<<std::hex<<pixelFormat<<std::dec<<std::endl;
@@ -467 +467 @@
         case(GL_COMPRESSED_RED_RGTC1_EXT):   return 1;
         case(GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT): return 2;
-        case(GL_COMPRESSED_RED_GREEN_RGTC2_EXT): return 2;    
+        case(GL_COMPRESSED_RED_GREEN_RGTC2_EXT): return 2;
         case(GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG): return 3;
         case(GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG): return 3;
@@ -564 +564 @@
             return 0;
         }
-    }        
+    }
 }
 
@@ -633 +633 @@
     switch(type)
     {
-   
+
         case(GL_BITMAP): return computeNumComponents(format);
-        
+
         case(GL_BYTE):
         case(GL_UNSIGNED_BYTE): return 8*computeNumComponents(format);
-        
+
         case(GL_HALF_FLOAT_NV):
         case(GL_SHORT):
         case(GL_UNSIGNED_SHORT): return 16*computeNumComponents(format);
-        
+
         case(GL_INT):
         case(GL_UNSIGNED_INT):
         case(GL_FLOAT): return 32*computeNumComponents(format);
-    
-    
-        case(GL_UNSIGNED_BYTE_3_3_2): 
+
+
+        case(GL_UNSIGNED_BYTE_3_3_2):
         case(GL_UNSIGNED_BYTE_2_3_3_REV): return 8;
-        
+
         case(GL_UNSIGNED_SHORT_5_6_5):
         case(GL_UNSIGNED_SHORT_5_6_5_REV):
@@ -657 +657 @@
         case(GL_UNSIGNED_SHORT_5_5_5_1):
         case(GL_UNSIGNED_SHORT_1_5_5_5_REV): return 16;
-        
+
         case(GL_UNSIGNED_INT_8_8_8_8):
         case(GL_UNSIGNED_INT_8_8_8_8_REV):
         case(GL_UNSIGNED_INT_10_10_10_2):
         case(GL_UNSIGNED_INT_2_10_10_10_REV): return 32;
-        default: 
+        default:
         {
             OSG_WARN<<"error type = "<<type<<std::endl;
             return 0;
         }
-    }    
+    }
 
 }
@@ -711 +711 @@
 {
     if (width==0 || height==0 || depth==0) return 0;
-    
+
     return osg::maximum(
             Image::computeRowWidthInBytes(width,pixelFormat,type,packing)*height*depth,
@@ -758 +758 @@
         case(GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT):
         case(GL_COMPRESSED_RED_GREEN_RGTC2_EXT):
-        case(GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG): 
+        case(GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG):
         case(GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG):
         case(GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG):
@@ -771 +771 @@
 unsigned int Image::getTotalSizeInBytesIncludingMipmaps() const
 {
-    if (_mipmapData.empty()) 
+    if (_mipmapData.empty())
     {
         // no mips so just return size of main image
         return getTotalSizeInBytes();
     }
-    
+
     int s = _s;
     int t = _t;
@@ -784 +784 @@
     {
         totalSize += computeImageSizeInBytes(s, t, r, _pixelFormat, _dataType, _packing);
-        
+
         s >>= 1;
         t >>= 1;
@@ -797 +797 @@
 }
 
-void Image::setRowLength(int length) 
-{ 
+void Image::setRowLength(int length)
+{
     _rowLength = length;
     #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
-    if (length > 0) 
+    if (length > 0)
     {
         OSG_WARN << "Image::setRowLength is not supported on this platform, ignoring" << std::endl;
@@ -811 +811 @@
 void Image::setInternalTextureFormat(GLint internalFormat)
 {
-    // won't do any sanity checking right now, leave it to 
+    // won't do any sanity checking right now, leave it to
     // OpenGL to make the call.
     _internalTextureFormat = internalFormat;
@@ -844 +844 @@
 
     unsigned int previousTotalSize = 0;
-    
+
     if (_data) previousTotalSize = computeRowWidthInBytes(_s,_pixelFormat,_dataType,_packing)*_t*_r;
-    
+
     unsigned int newTotalSize = computeRowWidthInBytes(s,format,type,packing)*t*r;
 
@@ -866 +866 @@
         _packing = packing;
         _rowLength = 0;
-        
+
         // preserve internalTextureFormat if already set, otherwise
         // use the pixelFormat as the source for the format.
@@ -873 +873 @@
     else
     {
-    
+
         // failed to allocate memory, for now, will simply set values to 0.
         _s = 0;
@@ -882 +882 @@
         _packing = 0;
         _rowLength = 0;
-        
+
         // commenting out reset of _internalTextureFormat as we are changing
         // policy so that allocateImage honours previous settings of _internalTextureFormat.
         //_internalTextureFormat = 0;
     }
-    
+
     dirty();
 }
@@ -913 +913 @@
     _packing = packing;
     _rowLength = rowLength;
-        
+
     dirty();
 
@@ -939 +939 @@
     const osg::Texture2DArray::Extensions* extensions2DArray = osg::Texture2DArray::getExtensions(contextID,true);
 
-    
+
     GLboolean binding1D = GL_FALSE, binding2D = GL_FALSE, binding3D = GL_FALSE, binding2DArray = GL_FALSE, bindingCubeMap = GL_FALSE;
 
@@ -977 +977 @@
         }
     }
-    
+
     if (textureMode==0) return;
 
@@ -1003 +1003 @@
         numMipMaps = 1;
     }
-    
+
     // OSG_NOTICE<<"Image::readImageFromCurrentTexture() : numMipMaps = "<<numMipMaps<<std::endl;
 
-        
+
     GLint compressed = 0;
 
@@ -1030 +1030 @@
         }
     }
-    
-    
-        
+
+
+
     /* if the compression has been successful */
     if (compressed == GL_TRUE)
@@ -1038 +1038 @@
 
         MipmapDataType mipMapData;
-        
+
         unsigned int total_size = 0;
         GLint i;
@@ -1044 +1044 @@
         {
             if (i>0) mipMapData.push_back(total_size);
-            
+
             GLint compressed_size;
             glGetTexLevelParameteriv(textureMode, i, GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB, &compressed_size);
-            
+
             total_size += compressed_size;
         }
-        
-        
+
+
         unsigned char* data = new unsigned char[total_size];
         if (!data)
         {
             OSG_WARN<<"Warning: Image::readImageFromCurrentTexture(..) out of memory, now image read."<<std::endl;
-            return; 
+            return;
         }
 
@@ -1074 +1074 @@
         _t = height;
         _r = depth;
-        
+
         _pixelFormat = internalformat;
         _dataType = type;
@@ -1089 +1089 @@
 
         dirty();
-    
+
     }
     else
@@ -1108 +1108 @@
         {
             if (i>0) mipMapData.push_back(total_size);
-            
+
             glGetTexLevelParameteriv(textureMode, i, GL_TEXTURE_WIDTH, &width);
             glGetTexLevelParameteriv(textureMode, i, GL_TEXTURE_HEIGHT, &height);
             glGetTexLevelParameteriv(textureMode, i, GL_TEXTURE_DEPTH, &depth);
-            
+
             unsigned int level_size = computeRowWidthInBytes(width,internalformat,type,packing)*height*depth;
 
             total_size += level_size;
         }
-        
-        
+
+
         unsigned char* data = new unsigned char[total_size];
         if (!data)
         {
             OSG_WARN<<"Warning: Image::readImageFromCurrentTexture(..) out of memory, now image read."<<std::endl;
-            return; 
+            return;
         }
 
@@ -1136 +1136 @@
         _t = height;
         _r = depth;
-        
+
         _pixelFormat = computePixelFormat(internalformat);
         _dataType = type;
@@ -1144 +1144 @@
         _packing = packing;
         _rowLength = rowLength;
-        
+
         for(i=0;i<numMipMaps;++i)
         {
@@ -1151 +1151 @@
 
         dirty();
-    }    
+    }
 #else
     OSG_NOTICE<<"Warning: Image::readImageFromCurrentTexture() not supported."<<std::endl;
@@ -1287 +1287 @@
         unsigned int rowStepInBytes = getRowStepInBytes();
         unsigned int imageStepInBytes = getImageStepInBytes();
-        
+
         for(int r=0;r<_r;++r)
         {
@@ -1313 +1313 @@
         return;
     }
-        
+
     dirty();
 }
@@ -1363 +1363 @@
                 unsigned char* top = data(0,0,r);
                 unsigned char* bottom = top + (_t-1)*rowStep;
-                    
+
                 flipImageVertical(top, bottom, rowSize, rowStep);
             }
@@ -1398 +1398 @@
             }
        }
-    }   
+    }
 
     dirty();
@@ -1429 +1429 @@
     {
         for(int row=0; row<_t; ++row)
-        {        
+        {
             unsigned char* front = data(0, row, r_front);
             unsigned char* back = data(0, row, r_back);
@@ -1445 +1445 @@
     int new_s = computeNearestPowerOfTwo(_s);
     int new_t = computeNearestPowerOfTwo(_t);
-    
+
     if (new_s>maxTextureSize) new_s = maxTextureSize;
     if (new_t>maxTextureSize) new_t = maxTextureSize;
-    
+
     if (new_s!=_s || new_t!=_t)
     {
@@ -1470 +1470 @@
 
 
-template <typename T>    
+template <typename T>
 bool _findLowerAlphaValueInRow(unsigned int num, T* data,T value, unsigned int delta)
 {
@@ -1481 +1481 @@
 }
 
-template <typename T>    
+template <typename T>
 bool _maskedFindLowerAlphaValueInRow(unsigned int num, T* data,T value, T mask, unsigned int delta)
 {
@@ -1592 +1592 @@
                                                         0x00000003u, 1))
                         return true;
-                    break;                    
+                    break;
                 case(GL_UNSIGNED_INT_2_10_10_10_REV):
                     if (_maskedFindLowerAlphaValueInRow(s(), (unsigned int*)d,
@@ -1620 +1620 @@
 
 
-#include <osg/TextureRectangle> 
+#include <osg/TextureRectangle>
 
 
@@ -1705 +1705 @@
 }
 
-template <typename T>    
+template <typename T>
 Vec4 _readColor(GLenum pixelFormat, T* data,float scale)
 {