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

Introduced the use of a ReentrantMutex to avoid problems with findFontFile.

Browse Source
This commit is contained in:
Robert Osfield 2007-09-15 17:40:08 +00:00
parent e433762105
commit e19f23021f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgText/Font.cpp
View File

@ -23,12 +23,14 @@
#include <osgDB/FileNameUtils>
#include <osg/GLU>
#include <OpenThreads/ReentrantMutex>
using namespace osgText;
using namespace std;
static osg::ApplicationUsageProxy Font_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXT_INCREMENTAL_SUBLOADING <type>","ON | OFF");
static OpenThreads::Mutex s_FontFileMutex;
static OpenThreads::ReentrantMutex s_FontFileMutex;
Font::FontMutex* osgText::Font::getSerializeFontCallsMutex()
{
@ -42,7 +44,7 @@ std::string osgText::findFontFile(const std::string& str)
std::string filename = osgDB::findDataFile(str);
if (!filename.empty()) return filename;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(s_FontFileMutex);
static osgDB::FilePathList s_FontFilePath;
static bool initialized = false;