From bc7f1cf5ace93f2844961bb8ee673d748c6c249d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 5 May 2009 12:56:30 +0000
Subject: [PATCH] Merged from svn/trunk support for searching for imagery in
 path relative to the .osg file being loaded.  Merged using:

svn merge -r 10100:10137 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/osgVolume
---
 src/osgPlugins/osgVolume/ImageLayer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/osgVolume/ImageLayer.cpp b/src/osgPlugins/osgVolume/ImageLayer.cpp
index d2f2a4a18..9322e9cc9 100644
--- a/src/osgPlugins/osgVolume/ImageLayer.cpp
+++ b/src/osgPlugins/osgVolume/ImageLayer.cpp
@@ -56,7 +56,7 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
                 osgDB::FileType fileType = osgDB::fileType(filename);
                 if (fileType == osgDB::FILE_NOT_FOUND)
                 {
-                    filename = osgDB::findDataFile(filename);
+                    filename = osgDB::findDataFile(filename, fr.getOptions());
                     fileType = osgDB::fileType(filename);
                 }
 
@@ -71,10 +71,10 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
                     image = osgDB::readRefImageFile( filename );
                 }
 
-                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();
                 }