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

Changed mutex reference to a mutex pointer to avoid problems with wrappers

Browse Source
This commit is contained in:
Robert Osfield 2007-08-31 20:30:45 +00:00
parent 76063a94bd
commit 13faad13e8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgText/Font
View File

@ -164,7 +164,7 @@ public:
typedef OpenThreads::Mutex FontMutex;
/** Get the mutex that enables the serialization of calls to this font.*/
FontMutex& getSerializeFontCallsMutex() const { return _serializeFontCallsMutex; }
FontMutex* getSerializeFontCallsMutex() const { return &_serializeFontCallsMutex; }
protected:

2
src/osgText/Text.cpp
View File

@ -464,7 +464,7 @@ void Text::computeGlyphRepresentation()
return;
}
OpenThreads::ScopedLock<Font::FontMutex> lock(activefont->getSerializeFontCallsMutex());
OpenThreads::ScopedLock<Font::FontMutex> lock(*(activefont->getSerializeFontCallsMutex()));
// initialize bounding box, it will be expanded during glyph position calculation
_textBB.init();

8
src/osgWrappers/osgText/Font.cpp
View File

@ -213,9 +213,9 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font)
__void__releaseGLObjects__osg_State_P1,
"If State is non-zero, this function releases OpenGL objects for the specified graphics context. ",
"Otherwise, releases OpenGL objexts for all graphics contexts. ");
I_Method0(osgText::Font::FontMutex &, getSerializeFontCallsMutex,
I_Method0(osgText::Font::FontMutex *, getSerializeFontCallsMutex,
Properties::NON_VIRTUAL,
__FontMutex_R1__getSerializeFontCallsMutex,
__FontMutex_P1__getSerializeFontCallsMutex,
"Get the mutex that enables the serialization of calls to this font. ",
"");
I_ProtectedMethod4(void, addGlyph, IN, unsigned int, width, IN, unsigned int, height, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph,
@ -248,8 +248,8 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font)
I_SimpleProperty(osg::Texture::FilterMode, MinFilterHint,
__osg_Texture_FilterMode__getMinFilterHint,
__void__setMinFilterHint__osg_Texture_FilterMode);
I_SimpleProperty(osgText::Font::FontMutex &, SerializeFontCallsMutex,
__FontMutex_R1__getSerializeFontCallsMutex,
I_SimpleProperty(osgText::Font::FontMutex *, SerializeFontCallsMutex,
__FontMutex_P1__getSerializeFontCallsMutex,
0);
I_SimpleProperty(osg::StateSet *, StateSet,
__osg_StateSet_P1__getStateSet,