Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/osga/OSGA_Archive.h

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.h (modified) (15 diffs)

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

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -19 +19 @@
 #include <OpenThreads/ReentrantMutex>
 
-#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)  
+#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)
 
 class OSGA_Archive : public osgDB::Archive
@@ -25 +25 @@
     public:
         OSGA_Archive();
-        virtual ~OSGA_Archive(); 
+        virtual ~OSGA_Archive();
 
         virtual const char* libraryName() const { return "osga"; }
@@ -35 +35 @@
             return osgDB::equalCaseInsensitive(extension,"osga");
         }
-        
+
         /** open the archive.*/
         virtual bool open(const std::string& filename, ArchiveStatus status, unsigned int indexBlockSizeHint=4096);
@@ -47 +47 @@
         /** Get the file name which represents the archived file.*/
         virtual std::string getArchiveFileName() const { return _archiveFileName; }
-        
+
         /** Get the file name which represents the master file recorded in the Archive.*/
         virtual std::string getMasterFileName() const;
-        
+
         /** return true if file exists in archive.*/
         virtual bool fileExists(const std::string& filename) const;
@@ -90 +90 @@
         /** Write an osg::Shader with specified file name to the Archive.*/
         virtual WriteResult writeShader(const osg::Shader& shader,const std::string& fileName,const Options* options=NULL) const;
-        
+
         #if defined(_MSC_VER)
         typedef __int64 pos_type;
@@ -98 +98 @@
         typedef unsigned long long size_type;
         #endif
-        
+
         typedef std::pair<pos_type, size_type> PositionSizePair;
         typedef std::map<std::string, PositionSizePair> FileNamePositionMap;
-        
+
     protected:
-  
+
         mutable OpenThreads::ReentrantMutex _serializerMutex;
 
@@ -113 +113 @@
         public:
             IndexBlock(unsigned int blockSize=0);
-            
+
             inline pos_type getPosition() const { return _filePosition; }
 
@@ -120 +120 @@
 
             void setPositionNextIndexBlock(pos_type position);
-            
+
             inline pos_type getPositionNextIndexBlock() const { return _filePositionNextIndexBlock; }
 
 
             static IndexBlock* read(std::istream& in, bool doEndianSwap);
-            
+
             std::string getFirstFileName() const;
 
             bool getFileReferences(FileNamePositionMap& indexMap) const;
-            
+
 
             inline bool requiresWrite() const { return _requiresWrite; }
-            
+
             void write(std::ostream& out);
-            
+
             inline bool spaceAvailable(pos_type, size_type, const std::string& filename) const
             {
@@ -140 +140 @@
                 return (_offsetOfNextAvailableSpace + requiredSize)<_blockSize;
             }
-            
+
             bool addFileReference(pos_type position, size_type size, const std::string& filename);
-            
+
 
 
         protected:
-            
+
             void allocateData(unsigned int blockSize);
-        
+
             virtual ~IndexBlock();
             bool            _requiresWrite;
@@ -158 +158 @@
             char*           _data;
         };
-    
-    public: 
+
+    public:
         /** Functor used in internal implementations.*/
         struct ReadFunctor
@@ -187 +187 @@
             const osgDB::ReaderWriter::Options* _options;
         };
-        
+
     protected:
         struct ReadObjectFunctor;
@@ -205 +205 @@
         osgDB::ReaderWriter::ReadResult read(const ReadFunctor& readFunctor);
         osgDB::ReaderWriter::WriteResult write(const WriteFunctor& writeFunctor);
-    
+
         typedef std::list< osg::ref_ptr<IndexBlock> >   IndexBlockList;
-        
+
         bool _open(std::istream& fin);
 
         void writeIndexBlocks();
-        
+
         bool addFileReference(pos_type position, size_type size, const std::string& fileName);
-        
+
         static float        s_currentSupportedVersion;
         float               _version;
@@ -224 +224 @@
         IndexBlockList      _indexBlockList;
         FileNamePositionMap _indexMap;
-        
+
 
         template <typename T>
@@ -231 +231 @@
             std::copy(reinterpret_cast<const char*>(&value),reinterpret_cast<const char*>(&value)+sizeof(value),ptr);
         }
-        
+
         template <typename T>
         static inline void _read(char* ptr, T& value)