Changeset 9527 for OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PaletteRecords.cpp

Timestamp:

01/21/09 19:23:55 (4 years ago)

Author:

robert

Message:

Replaced readImageFile() usage with readRefImageFile() to prevent threading issues with caching of imagery in the osgDB::Registry cache.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PaletteRecords.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PaletteRecords.cpp

@@ -291 +291 @@
     osg::StateSet* readTexture(const std::string& filename, const Document& document) const
     {
-        osg::Image* image = osgDB::readImageFile(filename,document.getOptions());
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename,document.getOptions());
         if (!image) return NULL;
 
@@ -301 +301 @@
         texture->setWrap(osg::Texture2D::WRAP_T,osg::Texture2D::REPEAT);
         texture->setResizeNonPowerOfTwoHint(true);
-        texture->setImage(image);
+        texture->setImage(image.get());
         stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);