Changeset 13041 for OpenSceneGraph/trunk/src/osgDB/InputStream.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgDB/InputStream.cpp (modified) (26 diffs)

OpenSceneGraph/trunk/src/osgDB/InputStream.cpp

@@ -29 +29 @@
     if ( !options ) return;
     _options = options;
-    
+
     std::string schema;
     if ( options->getPluginStringData("ForceReadingImage")=="true" )
@@ -44 +44 @@
         }
     }
-    
+
     if ( schema.empty() )
     {
@@ -224 +224 @@
 {
     osg::ref_ptr<osg::Array> array = NULL;
-    
+
     unsigned int id = 0;
     *this >> PROPERTY("ArrayID") >> id;
-    
+
     ArrayMap::iterator itr = _arrayMap.find( id );
     if ( itr!=_arrayMap.end() )
@@ -233 +233 @@
         return itr->second.get();
     }
-    
+
     DEF_MAPPEE(ArrayType, type);
     *this >> type;
@@ -388 +388 @@
         throwException( "InputStream::readArray(): Unsupported array type." );
     }
-    
+
     if ( getException() ) return NULL;
     _arrayMap[id] = array;
@@ -398 +398 @@
 {
     osg::ref_ptr<osg::PrimitiveSet> primitive = NULL;
-    
+
     DEF_MAPPEE(PrimitiveType, type);
     DEF_MAPPEE(PrimitiveType, mode);
     *this >> type >> mode;
-    
+
     switch ( type.get() )
     {
@@ -472 +472 @@
         throwException( "InputStream::readPrimitiveSet(): Unsupported array type." );
     }
-    
+
     if ( getException() ) return NULL;
     return primitive.release();
 }
 
-osg::Image* InputStream::readImage(bool readFromExternal) 
+osg::Image* InputStream::readImage(bool readFromExternal)
 {
 
@@ -499 +499 @@
 
     osg::ref_ptr<osg::Image> image = NULL;
-    
+
     switch ( decision )
     {
@@ -506 +506 @@
         {
             image = new osg::Image;
-            
+
             // _origin, _s & _t & _r, _internalTextureFormat
             int origin, s, t, r, internalFormat;
             *this >> origin >> s >> t >> r >> internalFormat;
-            
+
             // _pixelFormat, _dataType, _packing, _allocationMode
             int pixelFormat, dataType, packing, mode;
             *this >> pixelFormat >> dataType >> packing >> mode;
-            
+
             // _data
             unsigned int size = 0; *this >> size;
@@ -523 +523 @@
                     throwException( "InputStream::readImage() Out of memory." );
                 if ( getException() ) return NULL;
-                
+
                 readCharArray( data, size );
                 image->setOrigin( (osg::Image::Origin)origin );
@@ -555 +555 @@
                 }
                 readCharArray( data, size );
-                
+
                 std::string ext = osgDB::getFileExtension( name );
                 osgDB::ReaderWriter* reader =
@@ -563 +563 @@
                     std::stringstream inputStream;
                     inputStream.write( data, size );
-                    
+
                     osgDB::ReaderWriter::ReadResult rr = reader->readImage( inputStream );
                     if ( rr.validImage() )
@@ -588 +588 @@
         break;
     }
-    
+
     if ( readFromExternal )
     {
@@ -611 +611 @@
     *this >> className >> BEGIN_BRACKET >> PROPERTY("UniqueID") >> id;
     if ( getException() ) return NULL;
-    
+
     IdentifierMap::iterator itr = _identifierMap.find( id );
     if ( itr!=_identifierMap.end() )
@@ -636 +636 @@
     }
     _fields.push_back( className );
-    
+
     osg::ref_ptr<osg::Object> obj = existingObj ? existingObj : wrapper->getProto()->cloneType();
     _identifierMap[id] = obj;
@@ -652 +652 @@
             }
             _fields.push_back( assocWrapper->getName() );
-            
+
             assocWrapper->read( *this, *obj );
             if ( getException() ) return NULL;
-            
+
             _fields.pop_back();
         }
@@ -670 +670 @@
     {
         if ( line[0]=='#' ) continue;  // Comment
-        
+
         StringList keyAndValue;
         split( line, keyAndValue, '=' );
         if ( keyAndValue.size()<2 ) continue;
-        
+
         setWrapperSchema( osgDB::trimEnclosingSpaces(keyAndValue[0]),
                           osgDB::trimEnclosingSpaces(keyAndValue[1]) );
@@ -684 +684 @@
     _fields.clear();
     _fields.push_back( "Start" );
-    
+
     ReadType type = READ_UNKNOWN;
     _in = inIterator;
@@ -692 +692 @@
 
     _in->setInputStream(this);
-    
+
     // Check OSG header information
     unsigned int version = 0;
@@ -700 +700 @@
         *this >> typeValue >> version;
         type = static_cast<ReadType>(typeValue);
-        
+
         unsigned int attributes; *this >> attributes;
         if ( attributes&0x2 ) _useSchemaData = true;
@@ -710 +710 @@
         else if ( typeString=="Image" ) type = READ_IMAGE;
         else if ( typeString=="Object" ) type = READ_OBJECT;
-        
+
         std::string osgName, osgVersion;
         *this >> PROPERTY("#Version") >> version;
         *this >> PROPERTY("#Generator") >> osgName >> osgVersion;
     }
-    
+
     // Record file version for back-compatibility checking of wrappers
     _fileVersion = version;
@@ -726 +726 @@
     if ( !isBinary() ) return;
     _fields.clear();
-    
+
     std::string compressorName; *this >> compressorName;
     if ( compressorName!="0" )
@@ -732 +732 @@
         std::string data;
         _fields.push_back( "Decompression" );
-        
+
         BaseCompressor* compressor = Registry::instance()->getObjectWrapperManager()->findCompressor(compressorName);
         if ( !compressor )
@@ -739 +739 @@
                                    << compressorName << std::endl;
         }
-        
+
         if ( !compressor->decompress(*(_in->getStream()), data) )
             throwException( "InputStream: Failed to decompress stream." );
@@ -748 +748 @@
         _fields.pop_back();
     }
-    
+
     if ( _useSchemaData )
     {
@@ -770 +770 @@
         return;
     }
-    
+
     StringList schema, methods, keyAndValue;
     std::vector<int> types;