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

Refactored the mutex usage in osgText and freetype plugin to prevent multi-thread crash

Browse Source
This commit is contained in:
Robert Osfield
2008-02-25 12:54:54 +00:00
parent 3333ca2b46
commit e869200b3d
10 changed files with 169 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/osgText/Font.cpp
View File

@@ -32,12 +32,6 @@ static osg::ApplicationUsageProxy Font_e0(osg::ApplicationUsage::ENVIRONMENTAL_V
static OpenThreads::ReentrantMutex s_FontFileMutex;
Font::FontMutex* osgText::Font::getSerializeFontCallsMutex()
{
static OpenThreads::Mutex s_serializeFontCallsMutex;
return &s_serializeFontCallsMutex;
}
std::string osgText::findFontFile(const std::string& str)
{
// try looking in OSGFILEPATH etc first for fonts.
@@ -330,14 +324,17 @@ osg::Texture::FilterMode Font::getMagFilterHint() const
Font::Glyph* Font::getGlyph(const FontResolution& fontRes, unsigned int charcode)
{
FontSizeGlyphMap::iterator itr = _sizeGlyphMap.find(fontRes);
if (itr!=_sizeGlyphMap.end())
{
GlyphMap& glyphmap = itr->second;
GlyphMap::iterator gitr = glyphmap.find(charcode);
if (gitr!=glyphmap.end()) return gitr->second.get();
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);
FontSizeGlyphMap::iterator itr = _sizeGlyphMap.find(fontRes);
if (itr!=_sizeGlyphMap.end())
{
GlyphMap& glyphmap = itr->second;
GlyphMap::iterator gitr = glyphmap.find(charcode);
if (gitr!=glyphmap.end()) return gitr->second.get();
}
}
if (_implementation.valid()) return _implementation->getGlyph(fontRes, charcode);
else return 0;
}
@@ -400,6 +397,8 @@ bool Font::hasVertical() const
void Font::addGlyph(const FontResolution& fontRes, unsigned int charcode, Glyph* glyph)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);
_sizeGlyphMap[fontRes][charcode]=glyph;
int posX=0,posY=0;

6
src/osgText/Font3D.cpp
View File

@@ -37,12 +37,6 @@ static OpenThreads::ReentrantMutex s_Font3DFileMutex;
namespace osgText
{
Font::FontMutex* Font3D::getSerializeFontCallsMutex()
{
static OpenThreads::Mutex s_serializeFontCallsMutex;
return &s_serializeFontCallsMutex;
}
std::string findFont3DFile(const std::string& str)
{
// try looking in OSGFILEPATH etc first for fonts.

2
src/osgText/Text3D.cpp
View File

@@ -224,8 +224,6 @@ void Text3D::computeGlyphRepresentation()
return;
}
OpenThreads::ScopedLock<Font3D::Font3DMutex> lock(*(_font->getSerializeFontCallsMutex()));
// initialize bounding box, it will be expanded during glyph position calculation
_textBB.init();