FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
The file includes another small compile-fix when using float-matrices."
This commit is contained in:
Robert Osfield
2012-12-03 16:49:47 +00:00
parent 35d17d4654
commit 24c612a2bd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -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 "<<foundFile<<std::endl;
@@ -2366,7 +2366,7 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
{
if (containsPropertyReference(volumeData.region))
{
tile->addUpdateCallback(new VolumeRegionCallback((matrix.valid() ? *matrix : osg::Matrixd::identity()), volumeData.region));
tile->addUpdateCallback(new VolumeRegionCallback((matrix.valid() ? *matrix : osg::Matrix::identity()), volumeData.region));
}
else
{