mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-28 02:30:05 +00:00
changes to make sure juce can re-initialise correctly after being de-initialised.
This commit is contained in:
parent
ba2c7d33f0
commit
cce448e7b0
11 changed files with 103 additions and 49 deletions
|
|
@ -158,6 +158,8 @@ public:
|
|||
|
||||
if (ftLib != 0)
|
||||
FT_Done_FreeType (ftLib);
|
||||
|
||||
clearSingletonInstance();
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
|
|
@ -522,15 +524,7 @@ public:
|
|||
sansSerif.add (faces[i]->getFamilyName());
|
||||
}
|
||||
|
||||
static FreeTypeInterface* getInstance()
|
||||
{
|
||||
static FreeTypeInterface* instance = 0;
|
||||
|
||||
if (instance == 0)
|
||||
instance = new FreeTypeInterface();
|
||||
|
||||
return instance;
|
||||
}
|
||||
juce_DeclareSingleton_SingleThreaded_Minimal (FreeTypeInterface, false);
|
||||
|
||||
private:
|
||||
//==============================================================================
|
||||
|
|
@ -541,6 +535,8 @@ private:
|
|||
OwnedArray<FreeTypeFontFace> faces;
|
||||
};
|
||||
|
||||
juce_ImplementSingleton_SingleThreaded (FreeTypeInterface);
|
||||
|
||||
|
||||
//==============================================================================
|
||||
void Typeface::initialiseTypefaceCharacteristics (const String& fontName,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue