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

Fix for GifImageStream::setReferenceTime

Browse Source 
Setting the reference time greater than the duration of a gif would cause a crash. Also, the current reference time is not immediately updated when manually setting the reference time.
This commit is contained in:
flashk 2018-10-03 11:32:10 -07:00 committed by Robert Osfield
parent 627c3df093
commit 273dd046c2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/gif/ReaderWriterGIF.cpp
View File

@ -112,14 +112,15 @@ public:
int i=1; int i=1;
int framePos = static_cast<int>(time*100.0/_multiplier); int framePos = static_cast<int>(time*100.0/_multiplier);
if ( framePos>=(int)_length ) framePos = osg::clampBetween(framePos, 0, (int)_length);
framePos = _length; _currentLength = framePos;
std::vector<FrameData*>::iterator lastFrame = --_dataList.end();
std::vector<FrameData*>::iterator it; std::vector<FrameData*>::iterator it;
for ( it=_dataList.begin(); it!=_dataList.end(); it++,i++ ) for ( it=_dataList.begin(); it!=_dataList.end(); it++,i++ )
{ {
framePos -= (*it)->delay; framePos -= (*it)->delay;
if ( framePos<0 ) if ( framePos<0 || it == lastFrame )
break; break;
} }
_dataNum = i-1; _dataNum = i-1;