Changeset 10136 for OpenSceneGraph/trunk/src/osgPlugins/osgVolume/ImageLayer.cpp

Timestamp:

05/05/09 14:18:24 (3 years ago)

Author:

robert

Message:

Fixed support for reading imagery relative to the .osg being loaded

Files:

• OpenSceneGraph/trunk/src/osgPlugins/osgVolume/ImageLayer.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/osgVolume/ImageLayer.cpp

@@ -57 +57 @@
                 if (fileType == osgDB::FILE_NOT_FOUND)
                 {
-                    filename = osgDB::findDataFile(filename);
+                    filename = osgDB::findDataFile(filename, fr.getOptions());
                     fileType = osgDB::fileType(filename);
                 }
@@ -72 +72 @@
                 }
 
-                osg::notify(osg::INFO)<<"osgVolume::ImageLayer image read: "<<filename<<" pixelFormat "<<std::hex<<image->getPixelFormat()<<" textureFormat "<<image->getInternalTextureFormat()<<" dataType "<<image->getDataType()<<std::dec<<std::endl;
 
                 if (image.valid())
                 {                
+                    osg::notify(osg::INFO)<<"osgVolume::ImageLayer image read: "<<filename<<" pixelFormat "<<std::hex<<image->getPixelFormat()<<" textureFormat "<<image->getInternalTextureFormat()<<" dataType "<<image->getDataType()<<std::dec<<std::endl;
                     layer.setImage(image.get());
                     layer.rescaleToZeroToOneRange();