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

From Stephan Huber, "As I have not all referenced image-data, SlideShowConstructor crashed on my end. Attached is a fix for that crash."

Browse Source
This commit is contained in:
Robert Osfield 2013-01-30 10:21:45 +00:00
parent 84c857d24d
commit 366fcbf59b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPresentation/SlideShowConstructor.cpp
View File

@ -1100,11 +1100,12 @@ osg::Image* SlideShowConstructor::readImage(const std::string& filename, const I
image = imageSequence; image = imageSequence;
} }
if (image.valid())
if (imageData.delayTime>0.0) image->setUserValue("delay",imageData.delayTime); {
if (imageData.startTime>0.0) image->setUserValue("start",imageData.startTime); if (imageData.delayTime>0.0) image->setUserValue("delay",imageData.delayTime);
if (imageData.stopTime>0.0) image->setUserValue("stop",imageData.stopTime); if (imageData.startTime>0.0) image->setUserValue("start",imageData.startTime);
if (imageData.stopTime>0.0) image->setUserValue("stop",imageData.stopTime);
}
return image.release(); return image.release();
} }