Show
Ignore:
Timestamp:
04/24/14 19:26:46 (14 hours ago)
Author:
robert
Message:

From Farshid Lashkari, "I've attached a small fix to the Collada loader which prevents a null pointer access in some cases."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgDB/ReadFile

    r13041 r13172  
    4444inline osg::Object* readObjectFile(const std::string& filename) 
    4545{ 
    46     return readObjectFile(filename,Registry::instance()->getOptions()); 
    47 } 
     46    return readObjectFile(filename, Registry::instance()->getOptions()); 
     47} 
     48 
     49template<typename T> 
     50inline T* readFile(const std::string& filename, const Options* options) 
     51{ 
     52    osg::ref_ptr<osg::Object> object = readObjectFile(filename, options); 
     53    osg::ref_ptr<T> t = dynamic_cast<T*>(object.get()); 
     54    object = 0;     
     55    return t.release(); 
     56} 
     57 
     58template<typename T> 
     59inline T* readFile(const std::string& filename) 
     60{ 
     61    return readFile<T>(filename, Registry::instance()->getOptions()); 
     62} 
     63 
    4864 
    4965/** Read an osg::Image from file.