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

OpenSceneGraph/trunk/src/osgPlugins/vtf/ReaderWriterVTF.cpp

@@ -6 +6 @@
 *                    into an osg::Image.
 *
-*                    Borrows heavily from the DDS plugin for OSG, as well 
+*                    Borrows heavily from the DDS plugin for OSG, as well
 *                    as the Valve Source SDK
 *
@@ -362 +362 @@
     int               mipSize;
     int               mipOffset;
-    
+
     // Validate the file with the 'VTF\0' magic number
     _istream.read(&vtf_header.magic_number[0], 4);
@@ -395 +395 @@
     // No depth in textures earlier than version 7.2
     if ((vtf_header.file_version[0] < 7) ||
-        ((vtf_header.file_version[0] == 7) && 
+        ((vtf_header.file_version[0] == 7) &&
          (vtf_header.file_version[1] < 2)))
     {
@@ -485 +485 @@
 
         // Allocate an osg::Image for the lo-res image metadata
-        osg::ref_ptr<osg::Image> loResImage = new osg::Image();    
+        osg::ref_ptr<osg::Image> loResImage = new osg::Image();
 
         // Set the image metadata, and figure out how many bytes to read
@@ -504 +504 @@
     supported = ConvertImageFormat(vtf_header.image_format, internalFormat,
                                    pixelFormat, dataType);
-    
+
     // Bail if the format isn't supported
     if (!supported)
@@ -528 +528 @@
 
     // Create the mipmap offsets vector
-    osg::Image::MipmapDataType mipmaps; 
+    osg::Image::MipmapDataType mipmaps;
 
     // Deal with mipmaps, if necessary
@@ -548 +548 @@
             int height = vtf_header.image_height;
             int blockSize;
-            
+
             if ((vtf_header.image_format == VTF_FORMAT_DXT1) ||
                 (vtf_header.image_format == VTF_FORMAT_DXT1_ONEBITALPHA))
@@ -608 +608 @@
 
     // Allocate the resulting osg::Image
-    osg::ref_ptr<osg::Image> osgImage = new osg::Image();    
+    osg::ref_ptr<osg::Image> osgImage = new osg::Image();
 
     // Set the image meta-data, including dimensions, format, data type,
@@ -697 +697 @@
                        imageData, osg::Image::USE_NEW_DELETE);
     if (mipmaps.size()>0)  osgImage->setMipmapLevels(mipmaps);
-         
+
     // Finally, return the image
     return osgImage.release();
@@ -706 +706 @@
 {
     // Not supported
-    return false; 
+    return false;
 }
 
@@ -714 +714 @@
 public:
     virtual const char* className() const
-    { 
-        return "VTF Image Reader/Writer"; 
+    {
+        return "VTF Image Reader/Writer";
     }
 
     virtual bool acceptsExtension(const std::string& extension) const
-    { 
-        return osgDB::equalCaseInsensitive(extension, "vtf"); 
+    {
+        return osgDB::equalCaseInsensitive(extension, "vtf");
     }
 
@@ -739 +739 @@
 
         std::string fileName = osgDB::findDataFile( file, options );
-    
+
         if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
-        
+
         osgDB::ifstream stream(fileName.c_str(), std::ios::in | std::ios::binary);
         if(!stream) return ReadResult::FILE_NOT_HANDLED;
@@ -753 +753 @@
         osg::Image* osgImage = ReadVTFFile(fin);
         if (osgImage==NULL) return ReadResult::FILE_NOT_HANDLED;
-        
+
         if (options && options->getOptionString().find("vtf_flip")!=std::string::npos)
         {
             osgImage->flipVertical();
         }
-        
+
         return osgImage;
     }