Changeset Navigation

Changeset 7331

Timestamp:

08/31/07 20:56:22

Author:

robert

Message:

Added mutex to protect the readFontFile calls

Files:

r7289	r7331
29	29	static osg::ApplicationUsageProxy Font_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXT_INCREMENTAL_SUBLOADING <type>","ON \| OFF");
30	30
	31	static OpenThreads::Mutex s_FontFileMutex;
31	32
32	33	std::string osgText::findFontFile(const std::string& str)
…	…
36	37	if (!filename.empty()) return filename;
37	38
	39	OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
38	40
39	41	static osgDB::FilePathList s_FontFilePath;
…	…
89	91	if (foundFile.empty()) return 0;
90	92
	93	OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
	94
91	95	osg::ref_ptr<osgDB::ReaderWriter::Options> localOptions;
92	96	if (!userOptions)
…	…
109	113	osgText::Font* osgText::readFontStream(std::istream& stream, const osgDB::ReaderWriter::Options* userOptions)
110	114	{
	115	OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
	116
111	117	osg::ref_ptr<osgDB::ReaderWriter::Options> localOptions;
112	118	if (!userOptions)