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

From Michael Guerrero, Fixed crash that occurred when openning an new movie file after all previous movie ImageStream had been closed. Also add a missing close of the movie file.

Browse Source
This commit is contained in:
Robert Osfield
2008-08-25 15:20:42 +00:00
parent 0c9214636f
commit 5c2a4b014e
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/quicktime/MovieData.cpp
View File

@@ -23,10 +23,14 @@ MovieData::MovieData() : _pointer(NULL), _movie(NULL), _gw(NULL), _fError(false)
MovieData::~MovieData()
{
{
if (_pointer) free(_pointer);
if (_gw) DisposeGWorld(_gw);
if (_movie) DisposeMovie(_movie);
if (_movie) {
CloseMovieFile(_resref);
DisposeMovie(_movie);
}
}
@@ -41,7 +45,7 @@ void MovieData::load(osg::Image* image, std::string afilename, float startTime)
osg::notify(osg::INFO) << "MovieData :: opening movie '" << filename << "'" << std::endl;
OSStatus err = MakeMovieFromPath(filename.c_str(),&_movie);
OSStatus err = MakeMovieFromPath(filename.c_str(), &_movie, _resref);
if (err !=0) {
_fError = true;
osg::notify(osg::FATAL) << " MovieData :: MakeMovieFromPath failed with err " << err << std::endl;