Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/osga/OSGA_Archive.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/osga/OSGA_Archive.cpp (modified) (37 diffs)

OpenSceneGraph/trunk/src/osgPlugins/osga/OSGA_Archive.cpp

@@ -11 +11 @@
 /*
 Functions to convert between
-    std::streampos ( typedef'ed as iostream::pos_type 
+    std::streampos ( typedef'ed as iostream::pos_type
               used as seekp,seekg argument and tellp,tellg return value )
-and 
+and
     OSGA_Archive::pos_type (64 bit file position index)
 
@@ -22 +22 @@
     and is returned as result from iostream tellp and tellg methods.
 
-    std::streampos can be implicitly cast from/to std::streamoff as 
+    std::streampos can be implicitly cast from/to std::streamoff as
     std::streampos class defines appropriate constructor and cast operator.
 
-    Since std::streamoff is usually defined as simple int, 
+    Since std::streamoff is usually defined as simple int,
     it is possible to call seekp( ), seekg( ) with int argument and
     assign tellp(), tellg() result to int type.
 
-    But this implicit methods fail when std::streamoff is 32 bit and 
+    But this implicit methods fail when std::streamoff is 32 bit and
     std::streampos actually points past 32 bit addressable range (2 GiB).
 
     Even if std::streamoff is 32 bit and incapable of representing 64 bit file
     positions, original std::streampos may be prefectly able to handle them.
-   
-    But, when such situation occurs more elaborate conversion methods from/to   
-    std::streampos are needed. Functions below employ such methods. 
-    
-    I made this fix for use with 32 bit Windows OSG. Acutally this 
-    solution is not dependent on OS but standard C++ library. 
-    Microsoft SDKs always use some version of Dinkumware libs. 
-
-    Practically this tweak is made for Dinkumware C++ libs. I hope it can 
+
+    But, when such situation occurs more elaborate conversion methods from/to
+    std::streampos are needed. Functions below employ such methods.
+
+    I made this fix for use with 32 bit Windows OSG. Acutally this
+    solution is not dependent on OS but standard C++ library.
+    Microsoft SDKs always use some version of Dinkumware libs.
+
+    Practically this tweak is made for Dinkumware C++ libs. I hope it can
     be easily extended to other 32bit systems supporting 64bit files, provided
     their std::streampos implementations are similar.
 
     I based my solution on a small portion of boost iostreams code.
-    For additional reference look at: 
+    For additional reference look at:
         http://boost.org/boost/iostreams/positioning.hpp
 */
 
-/* 
-    Recognize Dinkumware std C++ lib implementation. Its used by Microsoft, 
+/*
+    Recognize Dinkumware std C++ lib implementation. Its used by Microsoft,
     but method is more generic - should work in all Dinkumware environments.
 
-    Complex condition below was taken from 
+    Complex condition below was taken from
         http://boost.org/boost/iostreams/positioning.hpp
 
@@ -65 +65 @@
 
 inline std::streampos STREAM_POS( const OSGA_Archive::pos_type pos )
-{ 
+{
     return std::streampos( std::mbstate_t(), pos );
 }
 
 inline OSGA_Archive::pos_type ARCHIVE_POS( const std::streampos & pos )
-{ 
+{
 #if defined(_CPPLIB_VER)//newer Dinkumware(eg: one included with VC++ 2003,2005)
     fpos_t position = pos.seekpos();
@@ -80 +80 @@
     return OSGA_Archive::pos_type( position + offset );
 }
-#else // non Dinkumware std C++ lib implementations 
+#else // non Dinkumware std C++ lib implementations
 // do the old school streampos <-> streamoff casts
 inline std::streampos STREAM_POS( const OSGA_Archive::pos_type pos )
-{ 
+{
     return std::streampos( pos );
 }
 
 inline OSGA_Archive::pos_type ARCHIVE_POS( const std::streampos & pos )
-{ 
+{
     return OSGA_Archive::pos_type( pos );
 }
-#endif // Dinkumware std C++ lib 
+#endif // Dinkumware std C++ lib
 ////////////////////////////////////////////////////////////////////////////////
 float OSGA_Archive::s_currentSupportedVersion = 0.0;
@@ -118 +118 @@
     {
         _blockSize = blockSize;
-        
+
         // initialize the array
         char* end = _data + _blockSize;
@@ -138 +138 @@
     in.read(reinterpret_cast<char*>(&indexBlock->_filePositionNextIndexBlock), sizeof(indexBlock->_filePositionNextIndexBlock));
     in.read(reinterpret_cast<char*>(&indexBlock->_offsetOfNextAvailableSpace), sizeof(indexBlock-> _offsetOfNextAvailableSpace));
-    
+
     if (doEndianSwap)
     {
@@ -161 +161 @@
             while (ptr<end_ptr)
             {
-                osg::swapBytes(ptr,sizeof(pos_type)); 
+                osg::swapBytes(ptr,sizeof(pos_type));
                 ptr += sizeof(pos_type);
 
-                osg::swapBytes(ptr,sizeof(size_type)); 
+                osg::swapBytes(ptr,sizeof(size_type));
                 ptr += sizeof(size_type);
 
-                osg::swapBytes(ptr,sizeof(unsigned int)); 
+                osg::swapBytes(ptr,sizeof(unsigned int));
                 unsigned int filename_size; // = *(reinterpret_cast<unsigned int*>(ptr));
                 _read(ptr, filename_size);
@@ -185 +185 @@
 
     OSG_INFO<<"Read index block"<<std::endl;
-    
+
     return indexBlock.release();
-    
+
 }
 
@@ -214 +214 @@
 {
     if (!_data || _offsetOfNextAvailableSpace==0) return false;
-    
+
     bool valuesAdded = false;
-    
+
     char* ptr = _data;
     char* end_ptr = _data + _offsetOfNextAvailableSpace;
     while (ptr<end_ptr)
     {
-        pos_type position; // = *(reinterpret_cast<pos_type*>(ptr)); 
+        pos_type position; // = *(reinterpret_cast<pos_type*>(ptr));
         _read(ptr, position);
         ptr += sizeof(pos_type);
-        
-        size_type size; // = *(reinterpret_cast<size_type*>(ptr)); 
+
+        size_type size; // = *(reinterpret_cast<size_type*>(ptr));
         _read(ptr, size);
         ptr += sizeof(size_type);
@@ -232 +232 @@
         _read(ptr, filename_size);
         ptr += sizeof(unsigned int);
-        
+
         std::string filename(ptr, ptr+filename_size);
-        
-        // record this entry into the FileNamePositionMap. 
+
+        // record this entry into the FileNamePositionMap.
         // Requests for files will be in unix style even on Win32 so need unix style keys in map.
         indexMap[osgDB::convertFileNameToUnixStyle(filename)] = PositionSizePair(position,size);
-        
+
         ptr += filename_size;
-        
+
         valuesAdded = true;
     }
@@ -267 +267 @@
     out.write(reinterpret_cast<char*>(_data),_blockSize);
 
-    if( _filePosition < currentPos ) // move file ptr to the end of file 
+    if( _filePosition < currentPos ) // move file ptr to the end of file
         out.seekp( STREAM_POS( currentPos ) );
-    
+
     OSG_INFO<<"OSGA_Archive::IndexBlock::write() end"<<std::endl;
 }
@@ -279 +279 @@
     {
         char* ptr = _data+_offsetOfNextAvailableSpace;
-        
-        //*(reinterpret_cast<pos_type*>(ptr)) = position; 
+
+        //*(reinterpret_cast<pos_type*>(ptr)) = position;
         _write(ptr, position);
         ptr += sizeof(pos_type);
-        
-        //*(reinterpret_cast<size_type*>(ptr)) = size; 
+
+        //*(reinterpret_cast<size_type*>(ptr)) = size;
         _write(ptr, size);
         ptr += sizeof(size_type);
-        
+
         //*(reinterpret_cast<unsigned int*>(ptr)) = filename.size();
         _write(ptr, static_cast<unsigned int>(filename.size()));
         ptr += sizeof(unsigned int);
-        
+
         for(unsigned int i=0;i<filename.size();++i, ++ptr)
         {
             *ptr = filename[i];
         }
-        
+
         _offsetOfNextAvailableSpace = ptr-_data;
-        
+
         _requiresWrite = true;
 
         OSG_INFO<<"OSGA_Archive::IndexBlock::addFileReference("<<(unsigned int)position<<", "<<filename<<")"<<std::endl;
-        
+
         return true;
     }
@@ -346 +346 @@
             pos_type file_size( 0 );
             _input.seekg( 0, std::ios_base::end );
-            file_size = ARCHIVE_POS( _input.tellg() ); 
+            file_size = ARCHIVE_POS( _input.tellg() );
             if( _input.is_open() && file_size <= 0 )
-            {   // compute end of file postition manually ... 
+            {   // compute end of file postition manually ...
                 // seekp( 0, ios::end ), tellp( ) fails in 32 bit windows with files > 4 GiB
-                size_t BlockHeaderSize = 
-                    sizeof( unsigned int /*_blockSize*/ ) + 
+                size_t BlockHeaderSize =
+                    sizeof( unsigned int /*_blockSize*/ ) +
                     sizeof( pos_type /*_filePositionNextIndexBlock*/ ) +
                     sizeof( unsigned int /*_offsetOfNextAvailableSpace*/ );
-          
+
                 for(IndexBlockList::iterator itr=_indexBlockList.begin();
                     itr!=_indexBlockList.end();
@@ -378 +378 @@
             OSG_INFO<<"File position after open = "<<ARCHIVE_POS( _output.tellp() )<<" is_open "<<_output.is_open()<<std::endl;
 
-            // place write position at end of file. 
+            // place write position at end of file.
             _output.seekp( STREAM_POS( file_size ) );
 
@@ -408 +408 @@
             return true;
         }
-        
+
     }
 }
@@ -431 +431 @@
 
         bool validArchive = (identifier[0]=='o' && identifier[1]=='s' && identifier[2]=='g' && identifier[3]=='a');
-        if (validArchive) 
+        if (validArchive)
         {
 
@@ -458 +458 @@
 
             // now need to build the filename map.
-            _indexMap.clear();                
+            _indexMap.clear();
 
             if (!_indexBlockList.empty())
@@ -491 +491 @@
 
     _input.close();
-    
+
     if (_status==WRITE)
     {
@@ -557 +557 @@
         return false;
     }
-    
+
     if (!_output)
     {
@@ -563 +563 @@
         return false;
     }
-    
-    
+
+
     // if the masterFileName isn't set yet use this fileName
     if (_masterFileName.empty()) _masterFileName = fileName;
@@ -583 +583 @@
     }
 
-    // if not one available create a new block.    
+    // if not one available create a new block.
     if (!indexBlock)
     {
         if (previousBlock.valid()) previousBlock->setPositionNextIndexBlock( ARCHIVE_POS( _output.tellp() ) );
-    
+
         indexBlock = new IndexBlock(blockSize);
         indexBlock->write(_output);
         _indexBlockList.push_back(indexBlock.get());
     }
-    
+
     if (indexBlock.valid())
     {
@@ -605 +605 @@
 {
    public:
-   
+
       proxy_streambuf(std::streambuf* streambuf, unsigned int numChars):
         _streambuf(streambuf),
@@ -611 +611 @@
             setg(&oneChar, (&oneChar)+1, (&oneChar)+1);
     }
-   
+
       /// Destructor deallocates no buffer space.
       virtual ~proxy_streambuf()  {}
@@ -619 +619 @@
     protected:
 
-      unsigned int _numChars;      
+      unsigned int _numChars;
       char_type oneChar;
-      
+
       virtual int_type underflow()
       {
      if ( gptr() == &oneChar ) return traits_type::to_int_type(oneChar);
-        
-         if ( _numChars==0 ) return traits_type::eof();         
+
+         if ( _numChars==0 ) return traits_type::eof();
          --_numChars;
 
            int_type next_value = _streambuf->sbumpc();
-     
+
          if ( !traits_type::eq_int_type(next_value,traits_type::eof()) )
      {
@@ -636 +636 @@
             oneChar = traits_type::to_char_type(next_value);
      }
-    
+
          return next_value;
       }
@@ -644 +644 @@
 {
     ReadObjectFunctor(const std::string& filename, const ReaderWriter::Options* options):ReadFunctor(filename,options) {}
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw, std::istream& input) const { return rw.readObject(input, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw, std::istream& input) const { return rw.readObject(input, _options); }
 };
 
@@ -650 +650 @@
 {
    ReadImageFunctor(const std::string& filename, const ReaderWriter::Options* options):ReadFunctor(filename,options) {}
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw, std::istream& input)const  { return rw.readImage(input, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw, std::istream& input)const  { return rw.readImage(input, _options); }
 };
 
@@ -656 +656 @@
 {
     ReadHeightFieldFunctor(const std::string& filename, const ReaderWriter::Options* options):ReadFunctor(filename,options) {}
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw, std::istream& input) const { return rw.readHeightField(input, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw, std::istream& input) const { return rw.readHeightField(input, _options); }
 };
 
@@ -675 +675 @@
     SERIALIZER();
 
-    if (_status!=READ) 
+    if (_status!=READ)
     {
         OSG_INFO<<"OSGA_Archive::readObject(obj, "<<readFunctor._filename<<") failed, archive opened as write only."<<std::endl;
         return ReadResult(ReadResult::FILE_NOT_HANDLED);
     }
-    
+
     FileNamePositionMap::const_iterator itr = _indexMap.find(readFunctor._filename);
     if (itr==_indexMap.end())
@@ -687 +687 @@
         return ReadResult(ReadResult::FILE_NOT_FOUND);
     }
-    
+
     ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension(getLowerCaseFileExtension(readFunctor._filename));
     if (!rw)
@@ -694 +694 @@
         return ReadResult(ReadResult::FILE_NOT_HANDLED);
     }
-    
+
     OSG_INFO<<"OSGA_Archive::readObject(obj, "<<readFunctor._filename<<")"<<std::endl;
-    
+
     _input.seekg( STREAM_POS( itr->second.first ) );
 
@@ -707 +707 @@
 
     ins.rdbuf(mystreambuf._streambuf);
-    
+
     return result;
 }
@@ -743 +743 @@
         _object(object) {}
     const osg::Object& _object;
-    
-    virtual ReaderWriter::WriteResult doWrite(ReaderWriter& rw, std::ostream& output) const { return rw.writeObject(_object, output, _options); } 
+
+    virtual ReaderWriter::WriteResult doWrite(ReaderWriter& rw, std::ostream& output) const { return rw.writeObject(_object, output, _options); }
 };
 
@@ -754 +754 @@
     const osg::Image& _object;
 
-    virtual ReaderWriter::WriteResult doWrite(ReaderWriter& rw, std::ostream& output) const { return rw.writeImage(_object, output, _options); }    
+    virtual ReaderWriter::WriteResult doWrite(ReaderWriter& rw, std::ostream& output) const { return rw.writeImage(_object, output, _options); }
 };
 
@@ -764 +764 @@
     const osg::HeightField& _object;
 
-    virtual ReaderWriter::WriteResult doWrite(ReaderWriter& rw, std::ostream& output) const { return rw.writeHeightField(_object, output, _options); }    
+    virtual ReaderWriter::WriteResult doWrite(ReaderWriter& rw, std::ostream& output) const { return rw.writeHeightField(_object, output, _options); }
 };
 
@@ -791 +791 @@
     SERIALIZER();
 
-    if (_status!=WRITE) 
+    if (_status!=WRITE)
     {
         OSG_INFO<<"OSGA_Archive::write(obj, "<<writeFunctor._filename<<") failed, archive opened as read only."<<std::endl;
@@ -803 +803 @@
         return WriteResult(WriteResult::FILE_NOT_HANDLED);
     }
-    
+
     OSG_INFO<<"OSGA_Archive::write(obj, "<<writeFunctor._filename<<")"<<std::endl;
-    
+
     pos_type position = ARCHIVE_POS( _output.tellp() );
-    
+
     WriteResult result = writeFunctor.doWrite(*rw,_output);
-    
+
     pos_type final_position = ARCHIVE_POS( _output.tellp() );
     size_type size = size_type( final_position-position );
 
     if (result.success()) addFileReference(position, size, writeFunctor._filename);
-    
+
     return result;
 }