Changeset 13041 for OpenSceneGraph/trunk/src/osgDB/Registry.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/Registry.cpp (modified) (41 diffs)

OpenSceneGraph/trunk/src/osgDB/Registry.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 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.
 */
@@ -79 +79 @@
     ReaderWriter& operator * () { return *get(); }
     ReaderWriter* operator -> () { return get(); }
-    
+
     bool valid() { return get()!=0; }
-    
-    void operator ++() 
+
+    void operator ++()
     {
         _rwUsed.insert(get());
     }
-    
+
 
 protected:
@@ -94 +94 @@
     Registry::ReaderWriterList&     _rwList;
     OpenThreads::ReentrantMutex&    _pluginMutex;
-    
+
     std::set<ReaderWriter*>         _rwUsed;
 
-    ReaderWriter* get() 
+    ReaderWriter* get()
     {
         OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_pluginMutex);
@@ -207 +207 @@
 {
     static ref_ptr<Registry> s_registry = new Registry;
-    if (erase) 
-    {   
+    if (erase)
+    {
         s_registry->destruct();
         s_registry = 0;
@@ -224 +224 @@
     _buildKdTreesHint = Options::NO_PREFERENCE;
     _kdTreeBuilder = new osg::KdTreeBuilder;
-    
+
     const char* kdtree_str = getenv("OSG_BUILD_KDTREES");
     if (kdtree_str)
@@ -245 +245 @@
     if (fileCachePath)
     {
-        _fileCache = new FileCache(fileCachePath);    
+        _fileCache = new FileCache(fileCachePath);
     }
 
@@ -254 +254 @@
     _archiveExtList.push_back("osga");
     _archiveExtList.push_back("zip");
-    
+
     initFilePathLists();
 
@@ -292 +292 @@
     addFileExtensionAlias("ivz",  "gz");
     addFileExtensionAlias("ozg",  "gz");
-    
+
     addFileExtensionAlias("mag",  "dicom");
     addFileExtensionAlias("ph",   "dicom");
@@ -397 +397 @@
 
     #if defined(USE_VRML)
-        addFileExtensionAlias("wrl",   "vrml");    
+        addFileExtensionAlias("wrl",   "vrml");
     #elif defined(USE_INVENTOR)
         addFileExtensionAlias("wrl",   "iv");
     #endif
-    
+
     // add alias for the text/freetype plugin.
     addFileExtensionAlias("ttf",    "freetype");  // true type
@@ -421 +421 @@
     addFileExtensionAlias("pgm", "pnm");
     addFileExtensionAlias("ppm", "pnm");
-    
+
 
     // add revision file mappings
@@ -439 +439 @@
         addMimeTypeExtensionMapping( mimeType, builtinMimeTypeExtMappings[i+1] );
     }
-    
+
     // register server protocols, so the curl can handle it, if necessary
     registerProtocol("http");
@@ -460 +460 @@
     // OSG_NOTICE<<"Registry::destruct()"<<std::endl;
 
-    // clean up the SharedStateManager 
+    // clean up the SharedStateManager
     _sharedStateManager = 0;
-    
+
 
     // clean up the FileCache
     _fileCache = 0;
-    
+
 
     // object cache clear needed here to prevent crash in unref() of
@@ -476 +476 @@
     clearObjectCache();
     clearArchiveCache();
-    
+
 
     // unload all the plugin before we finally destruct.
@@ -491 +491 @@
     //
     char *ptr;
-  
+
     if( (ptr = getenv( "OSG_FILE_PATH" )) )
     {
@@ -505 +505 @@
     osgDB::appendPlatformSpecificResourceFilePaths(filepath);
     setDataFilePathList(filepath);
-    
+
 }
 
 void Registry::setDataFilePathList(const std::string& paths)
 {
-    _dataFilePath.clear(); 
+    _dataFilePath.clear();
     convertStringPathIntoFilePathList(paths,_dataFilePath);
 }
@@ -534 +534 @@
         setLibraryFilePathList(ptr);
     }
-    
+
     appendPlatformSpecificLibraryFilePaths(_libraryFilePath);
 
@@ -555 +555 @@
         loadLibrary(value);
     }
-        
+
     while(arguments.read("-e",value))
     {
@@ -851 +851 @@
         if((*itr)->acceptsExtension(ext)) return (*itr).get();
     }
-    
+
     // now look for a plug-in to load the file.
     std::string libraryName = createLibraryNameForExtension(ext);
@@ -881 +881 @@
 
 #if 0
-struct concrete_wrapper: basic_type_wrapper 
+struct concrete_wrapper: basic_type_wrapper
 {
     virtual ~concrete_wrapper() {}
@@ -899 +899 @@
     ReadObjectFunctor(const std::string& filename, const Options* options):ReadFunctor(filename,options) {}
 
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw) const { return rw.readObject(_filename, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw) const { return rw.readObject(_filename, _options); }
     virtual bool isValid(ReaderWriter::ReadResult& readResult) const { return readResult.validObject(); }
     virtual bool isValid(osg::Object* object) const { return object!=0;  }
@@ -910 +910 @@
     ReadImageFunctor(const std::string& filename, const Options* options):ReadFunctor(filename,options) {}
 
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw)const  { return rw.readImage(_filename, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw)const  { return rw.readImage(_filename, _options); }
     virtual bool isValid(ReaderWriter::ReadResult& readResult) const { return readResult.validImage(); }
     virtual bool isValid(osg::Object* object) const { return dynamic_cast<osg::Image*>(object)!=0;  }
@@ -921 +921 @@
     ReadHeightFieldFunctor(const std::string& filename, const Options* options):ReadFunctor(filename,options) {}
 
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw) const { return rw.readHeightField(_filename, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw) const { return rw.readHeightField(_filename, _options); }
     virtual bool isValid(ReaderWriter::ReadResult& readResult) const { return readResult.validHeightField(); }
     virtual bool isValid(osg::Object* object) const { return dynamic_cast<osg::HeightField*>(object)!=0;  }
@@ -932 +932 @@
     ReadNodeFunctor(const std::string& filename, const Options* options):ReadFunctor(filename,options) {}
 
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw) const { return rw.readNode(_filename, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw) const { return rw.readNode(_filename, _options); }
     virtual bool isValid(ReaderWriter::ReadResult& readResult) const { return readResult.validNode(); }
     virtual bool isValid(osg::Object* object) const { return dynamic_cast<osg::Node*>(object)!=0;  }
@@ -945 +945 @@
         _status(status),
         _indexBlockSizeHint(indexBlockSizeHint) {}
-        
+
     ReaderWriter::ArchiveStatus _status;
     unsigned int _indexBlockSizeHint;
@@ -960 +960 @@
     ReadShaderFunctor(const std::string& filename, const Options* options):ReadFunctor(filename,options) {}
 
-    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw)const  { return rw.readShader(_filename, _options); }    
+    virtual ReaderWriter::ReadResult doRead(ReaderWriter& rw)const  { return rw.readShader(_filename, _options); }
     virtual bool isValid(ReaderWriter::ReadResult& readResult) const { return readResult.validShader(); }
     virtual bool isValid(osg::Object* object) const { return dynamic_cast<osg::Shader*>(object)!=0;  }
@@ -1018 +1018 @@
         {
             pathsContainsCurrentWorkingDirectory = true;
-        }        
+        }
     }
 
@@ -1029 +1029 @@
         }
     }
-    
+
 
     // if a directory is included in the filename, get just the (simple) filename itself and try that
@@ -1109 +1109 @@
             OSG_INFO<<"         archive : "<<archiveName<<std::endl;
             OSG_INFO<<"         filename : "<<fileName<<std::endl;
-        
+
             ReaderWriter::ReadResult result = openArchiveImplementation(archiveName,ReaderWriter::READ, 4096, readFunctor._options);
-        
+
             if (!result.validArchive()) return result;
 
             osgDB::Archive* archive = result.getArchive();
-        
+
             //if valid options were passed through the read functor clone them
             //otherwise make new options
@@ -1125 +1125 @@
 
             std::auto_ptr<ReadFunctor> rf(readFunctor.cloneType(fileName, options.get()));
-            
+
             result = rf->doRead(*archive);
 
@@ -1136 +1136 @@
         }
     }
-    
+
     // record the errors reported by readerwriters.
     typedef std::vector<ReaderWriter::ReadResult> Results;
@@ -1181 +1181 @@
             else if (ritr->status()==ReaderWriter::ReadResult::ERROR_IN_READING_FILE) ++num_ERROR_IN_READING_FILE;
         }
-        
+
         if (num_FILE_NOT_HANDLED!=results.size())
         {
@@ -1236 +1236 @@
         }
     }
-    
+
     if (!results.empty())
     {
@@ -1252 +1252 @@
             else if (ritr->status()==ReaderWriter::ReadResult::ERROR_IN_READING_FILE) ++num_ERROR_IN_READING_FILE;
         }
-        
+
         if (num_FILE_NOT_HANDLED!=results.size())
         {
@@ -1306 +1306 @@
             }
         }
-        
+
         ReaderWriter::ReadResult rr = read(readFunctor);
-        if (rr.validObject()) 
+        if (rr.validObject())
         {
             // update cache with new entry.
@@ -1438 +1438 @@
         return ReaderWriter::WriteResult("Warning: Could not find plugin to write image to file \""+fileName+"\".");
     }
-    
+
     if (results.front().message().empty())
     {
@@ -1501 +1501 @@
         }
     }
-    
+
     return results.front();
 }
@@ -1519 +1519 @@
 
     return readImplementation(ReadNodeFunctor(fileName, options),Options::CACHE_NODES);
-                              
+
 #endif
 }
@@ -1549 +1549 @@
         {
             ReaderWriter::WriteResult rr = itr->writeNode(node,fileName,options);
-    
+
             if (rr.success()) return rr;
             else results.push_back(rr);
@@ -1611 +1611 @@
         return ReaderWriter::WriteResult("Warning: Could not find plugin to write shader to file \""+fileName+"\".");
     }
-    
+
     if (results.front().message().empty())
     {
@@ -1710 +1710 @@
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_archiveCacheMutex);
     ArchiveCache::iterator itr = _archiveCache.find(fileName);
-    if (itr!=_archiveCache.end()) 
+    if (itr!=_archiveCache.end())
     {
         _archiveCache.erase(itr);
@@ -1759 +1759 @@
 {
     if (!_sharedStateManager) _sharedStateManager = new SharedStateManager;
-    
+
     return _sharedStateManager.get();
 }
 
 
-void Registry::registerProtocol(const std::string& protocol) 
-{  
-    _registeredProtocols.insert( convertToLowerCase(protocol) ); 
-}
-        
-bool Registry::isProtocolRegistered(const std::string& protocol) 
-{ 
-    return (_registeredProtocols.find( convertToLowerCase(protocol) ) != _registeredProtocols.end()); 
-}
-
+void Registry::registerProtocol(const std::string& protocol)
+{
+    _registeredProtocols.insert( convertToLowerCase(protocol) );
+}
+
+bool Registry::isProtocolRegistered(const std::string& protocol)
+{
+    return (_registeredProtocols.find( convertToLowerCase(protocol) ) != _registeredProtocols.end());
+}
+