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

Removed used of ref_ptr<>'s internally to avoid ciricular calls on destruction.

Browse Source
This commit is contained in:
Robert Osfield 2007-12-16 13:20:38 +00:00
parent becf6c22ea
commit e29423bba9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/freetype/FreeTypeLibrary.cpp
View File

@ -45,7 +45,8 @@ FreeTypeLibrary::~FreeTypeLibrary()
FreeTypeFont* fontImplementation = *_fontImplementationSet.begin(); FreeTypeFont* fontImplementation = *_fontImplementationSet.begin();
_fontImplementationSet.erase(_fontImplementationSet.begin()); _fontImplementationSet.erase(_fontImplementationSet.begin());
osgText::Font* font = fontImplementation->_facade; osgText::Font* font = fontImplementation->_facade;
font->setImplementation(0); if (font) font->setImplementation(0);
fontImplementation->_facade = 0;
} }
while(!_font3DImplementationSet.empty()) while(!_font3DImplementationSet.empty())
@ -53,7 +54,8 @@ FreeTypeLibrary::~FreeTypeLibrary()
FreeTypeFont3D* font3DImplementation = *_font3DImplementationSet.begin(); FreeTypeFont3D* font3DImplementation = *_font3DImplementationSet.begin();
_font3DImplementationSet.erase(_font3DImplementationSet.begin()); _font3DImplementationSet.erase(_font3DImplementationSet.begin());
osgText::Font3D* font3D = font3DImplementation->_facade; osgText::Font3D* font3D = font3DImplementation->_facade;
font3D->setImplementation(0); if (font3D) font3D->setImplementation(0);
font3DImplementation->_facade = 0;
} }
FT_Done_FreeType( _ftlibrary); FT_Done_FreeType( _ftlibrary);
@ -76,8 +78,8 @@ bool FreeTypeLibrary::getFace(const std::string& fontfile,unsigned int index, FT
} }
else if (error) else if (error)
{ {
osg::notify(osg::WARN)<<" .... another error code means that the font file could notd"<<std::endl; osg::notify(osg::WARN)<<" .... another error code means that the font file could not"<<std::endl;
osg::notify(osg::WARN)<<" .... be opened, read or simply that it is broken..d"<<std::endl; osg::notify(osg::WARN)<<" .... be opened, read or simply that it is broken.."<<std::endl;
return false; return false;
} }