Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.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/ive/DataOutputStream.cpp (modified) (23 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp

@@ -169 +169 @@
     {
         std::string optionsString = _options->getOptionString();
-    
+
         if(optionsString.find("noTexturesInIVEFile")!=std::string::npos) {
             setIncludeImageMode(IMAGE_REFERENCE_FILE);
@@ -199 +199 @@
             std::string::size_type endOfToken = optionsString.find_first_of('=', terrainErrorPos);
             std::string::size_type endOfNumber = optionsString.find_first_of(' ', endOfToken);
-            std::string::size_type numOfCharInNumber = (endOfNumber != std::string::npos) ? 
+            std::string::size_type numOfCharInNumber = (endOfNumber != std::string::npos) ?
                     endOfNumber-endOfToken-1 :
                     optionsString.size()-endOfToken-1;
@@ -207 +207 @@
                 std::string numberString = optionsString.substr(endOfToken+1, numOfCharInNumber);
                 _maximumErrorToSizeRatio = osg::asciiToDouble(numberString.c_str());
-                
+
                 OSG_DEBUG<<"TerrainMaximumErrorToSizeRatio = "<<_maximumErrorToSizeRatio<<std::endl;
             }
@@ -235 +235 @@
     writeUInt(ENDIAN_TYPE) ;
     writeUInt(getVersion());
-    
+
     writeInt(_compressionLevel);
 
     if (_compressionLevel>0)
     {
-    
-        _ostream = &_compressionStream;        
+
+        _ostream = &_compressionStream;
     }
 }
@@ -248 +248 @@
 {
     if (_compressionLevel>0)
-    { 
+    {
         _ostream = _output_ostream;
 
         std::string compressionString(_compressionStream.str());
         writeUInt(compressionString.size());
-        
+
         compress(*_output_ostream, compressionString);
     }
@@ -269 +269 @@
     z_stream strm;
     unsigned char out[CHUNK];
-    
+
     int level = 6;
     int stategy = Z_DEFAULT_STRATEGY; // looks to be the best for .osg/.ive files
@@ -280 +280 @@
     strm.zfree = Z_NULL;
     strm.opaque = Z_NULL;
-    ret = deflateInit2(&strm, 
+    ret = deflateInit2(&strm,
                        level,
                        Z_DEFLATED,
@@ -308 +308 @@
 
         if (have>0) fout.write((const char*)out, have);
-        
+
         if (fout.fail())
         {
@@ -660 +660 @@
     writeInt(size);
     if (size==0) return;
-    
+
     float minValue = (*a)[0];
-    float maxValue = minValue;    
+    float maxValue = minValue;
     for(int i=1; i<size; ++i)
     {
@@ -668 +668 @@
         if ((*a)[i]>maxValue) maxValue = (*a)[i];
     }
-    
+
     if (minValue==maxValue)
     {
@@ -679 +679 @@
 
     writeBool(false);
-    
+
     int packingSize = 4;
     if (maxError>0.0f)
     {
-    
+
         //float byteError = 0.0f;
         float byteMultiplier = 255.0f/(maxValue-minValue);
@@ -724 +724 @@
     {
         writeInt(1);
-        
+
         writeFloat(minValue);
         writeFloat(maxValue);
-        
+
         float byteMultiplier = 255.0f/(maxValue-minValue);
 
@@ -742 +742 @@
         writeFloat(minValue);
         writeFloat(maxValue);
-        
+
         float shortMultiplier = 65535.0f/(maxValue-minValue);
 
@@ -752 +752 @@
     }
     else
-    {            
+    {
         writeInt(4);
 
@@ -759 +759 @@
             writeFloat((*a)[i]);
         }
-        
+
     }
 
@@ -1435 +1435 @@
     if (image)
     {
-        if (image->getWriteHint()==osg::Image::STORE_INLINE) 
+        if (image->getWriteHint()==osg::Image::STORE_INLINE)
         {
             return IMAGE_INCLUDE_DATA;
         }
-        else if (image->getWriteHint()==osg::Image::EXTERNAL_FILE) 
+        else if (image->getWriteHint()==osg::Image::EXTERNAL_FILE)
         {
             return IMAGE_REFERENCE_FILE;
@@ -1451 +1451 @@
 {
     IncludeImageMode mode = getIncludeImageMode(image);
-    
+
     if ( getVersion() >= VERSION_0029)
     {
@@ -1854 +1854 @@
 {
     const osg::Node* node = dynamic_cast<const osg::Node*>(object);
-    if (node) 
+    if (node)
     {
         writeInt(IVENODE);
@@ -1862 +1862 @@
 
     const osg::StateSet* stateset = dynamic_cast<const osg::StateSet*>(object);
-    if (stateset) 
+    if (stateset)
     {
         writeInt(IVESTATESET);
@@ -1870 +1870 @@
 
     const osg::StateAttribute* sa = dynamic_cast<const osg::StateAttribute*>(object);
-    if (sa) 
+    if (sa)
     {
         writeInt(IVESTATEATTRIBUTE);
@@ -1878 +1878 @@
 
     const osg::Drawable* drawable = dynamic_cast<const osg::Drawable*>(object);
-    if (drawable) 
+    if (drawable)
     {
         writeInt(IVEDRAWABLE);
@@ -1886 +1886 @@
 
     const osgSim::ShapeAttributeList* sal = dynamic_cast<const osgSim::ShapeAttributeList*>(object);
-    if (sal) 
+    if (sal)
     {
         writeInt(IVESHAPEATTRIBUTELIST);
@@ -1906 +1906 @@
         fileName += o.str();
     }
-    
+
     fileName += ".dds";
     ++_textureFileNameNumber;
-    
+
     return fileName;
 }