Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/pvr/ReaderWriterPVR.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/osgPlugins/pvr/ReaderWriterPVR.cpp (modified) (13 diffs)

OpenSceneGraph/trunk/src/osgPlugins/pvr/ReaderWriterPVR.cpp

@@ -73 +73 @@
       int testWord;
       char testByte[sizeof(int)];
-    }endianTest; 
+    }endianTest;
     endianTest.testWord = 1;
     if( endianTest.testByte[0] == 1 )
@@ -80 +80 @@
       return true;
   }
-  
+
   template <class T>
   inline void swapBytes(  T &s )
   {
-    if( sizeof( T ) == 1 ) 
+    if( sizeof( T ) == 1 )
       return;
-    
+
     T d = s;
     BytePtr sptr = (BytePtr)&s;
     BytePtr dptr = &(((BytePtr)&d)[sizeof(T)-1]);
-    
+
     for( unsigned int i = 0; i < sizeof(T); i++ )
       *(sptr++) = *(dptr--);
@@ -118 +118 @@
 {
 public:
-    
+
     ReaderWriterPVR()
     {
         supportsExtension("pvr","PVR image format");
     }
-    
+
     virtual const char* className() const { return "PVR Image Reader/Writer"; }
 
-  
+
     ReadResult readPVRStream(std::istream& fin) const
     {
         PVRTexHeader header;
-        
+
         fin.read((char*)&header, sizeof(PVRTexHeader));
         if(!fin.good()){
@@ -136 +136 @@
             return ReadResult::ERROR_IN_READING_FILE;
         }
-        
+
         if(header.needsBytesSwapped())
             header.swapBytes();
-        
+
         if(gPVRTexIdentifier[0] != static_cast<char>((header.pvrTag >>  0) & 0xff) ||
            gPVRTexIdentifier[1] != static_cast<char>((header.pvrTag >>  8) & 0xff) ||
@@ -148 +148 @@
                 return ReadResult::FILE_NOT_HANDLED;
             }
-        
-        
+
+
         uint32_t formatFlags = header.flags & PVR_TEXTURE_FLAG_TYPE_MASK;
         GLenum internalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
         uint32_t width, height;
-        
+
         if(formatFlags == kPVRTextureFlagTypePVRTC_4 || formatFlags == kPVRTextureFlagTypePVRTC_2 ||
            formatFlags == kPVRTextureFlagTypeOGLPVRTC_4 || formatFlags == kPVRTextureFlagTypeOGLPVRTC_2 ||
@@ -163 +163 @@
             else if(formatFlags == kPVRTextureFlagTypeETC)
                 internalFormat = GL_ETC1_RGB8_OES;
-            
+
             width = header.width;
             height = header.height;
@@ -169 +169 @@
             osg::ref_ptr<osg::Image> image = new osg::Image;
             if (!image) return ReadResult::INSUFFICIENT_MEMORY_TO_LOAD;
-            
+
             unsigned char *imageData = new unsigned char[header.dataLength];
             if (!imageData) return ReadResult::INSUFFICIENT_MEMORY_TO_LOAD;
-            
+
             fin.read((char*)imageData, header.dataLength);
             if(!fin.good())
@@ -179 +179 @@
                 return ReadResult::ERROR_IN_READING_FILE;
             }
-            
+
             image->setImage(header.width, header.height, 1,
                             internalFormat,    internalFormat,
@@ -185 +185 @@
                             imageData,
                             osg::Image::USE_NEW_DELETE);
-            
+
             uint32_t dataOffset = 0;
             uint32_t blockSize = 0, widthBlocks = 0, heightBlocks = 0;
             uint32_t bpp = 4;
-            
+
             osg::Image::MipmapDataType mipmapdata;
-            
+
             // Calculate the data size for each texture level and respect the minimum number of blocks
             while(dataOffset < header.dataLength){
@@ -210 +210 @@
                     bpp = 2;
                 }
-                
+
                 // Clamp to minimum number of blocks
                 if(widthBlocks < 2)
@@ -216 +216 @@
                 if(heightBlocks < 2)
                     heightBlocks = 2;
-                
+
                 if(dataOffset > 0)
                     mipmapdata.push_back(dataOffset);
-                
+
                 dataOffset += widthBlocks * heightBlocks * ((blockSize  * bpp) / 8);
-                
+
                 width = osg::maximum(width >> 1, (uint32_t)1);
                 height = osg::maximum(height >> 1, (uint32_t)1);
             }
-            
+
             if(!mipmapdata.empty())
                 image->setMipmapLevels(mipmapdata);
-            
+
             return image.get();
         }
-        
+
         osg::notify(osg::WARN) << "Failed to read pvr data." << std::endl;
-        return ReadResult::FILE_NOT_HANDLED;    
-    }
-  
+        return ReadResult::FILE_NOT_HANDLED;
+    }
+
     virtual ReadResult readObject(std::istream& fin,const osgDB::ReaderWriter::Options* options =NULL) const
     {
@@ -250 +250 @@
         return readPVRStream(fin);
     }
-    
+
     virtual ReadResult readImage(const std::string& file, const osgDB::ReaderWriter::Options* options) const
     {
@@ -256 +256 @@
         if(!acceptsExtension(ext))
             return ReadResult::FILE_NOT_HANDLED;
-        
+
         std::string fileName = osgDB::findDataFile(file, options);
         if(fileName.empty())
             return ReadResult::FILE_NOT_FOUND;
-        
+
         std::ifstream istream(fileName.c_str(), std::ios::in | std::ios::binary);
         if(!istream) return ReadResult::FILE_NOT_HANDLED;