From 24c612a2bdc2d9fa05cf882fdff1947829de4f67 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 3 Dec 2012 16:49:47 +0000 Subject: [PATCH] From Stephan Huber, "I've found a bug in SlideShowConstructor::findFileAndRecordPath which does return an empty string if the file was not found, and this empty string got added to the fileNames-vector, so the curl-plugin tried to load only an empty file-name, the directory-prefix. I fixed findFileAndRecordPath, so it returns the unmodified filename, which can then be loaded by the curl-plugin. Please review my fix, as I am not sure if it has any side effects, as I know the code not that well. The file includes another small compile-fix when using float-matrices." --- src/osgPresentation/SlideShowConstructor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPresentation/SlideShowConstructor.cpp b/src/osgPresentation/SlideShowConstructor.cpp index d62f9e7a0..f8e730c06 100644 --- a/src/osgPresentation/SlideShowConstructor.cpp +++ b/src/osgPresentation/SlideShowConstructor.cpp @@ -1751,7 +1751,7 @@ osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filenam std::string SlideShowConstructor::findFileAndRecordPath(const std::string& filename) { std::string foundFile = osgDB::findDataFile(filename, _options.get()); - if (foundFile.empty()) return foundFile; + if (foundFile.empty()) return filename; OSG_INFO<<"foundFile "<addUpdateCallback(new VolumeRegionCallback((matrix.valid() ? *matrix : osg::Matrixd::identity()), volumeData.region)); + tile->addUpdateCallback(new VolumeRegionCallback((matrix.valid() ? *matrix : osg::Matrix::identity()), volumeData.region)); } else {