BASE: Free TTFLibrary singleton on shutdown.

This uses a helper function because TTFLibrary is internal.
This commit is contained in:
Alyssa Milburn 2012-03-28 19:17:53 +02:00
parent 6d3927cd7a
commit b470c9af28
3 changed files with 12 additions and 0 deletions

View File

@ -57,6 +57,9 @@
#include "graphics/cursorman.h"
#include "graphics/fontman.h"
#ifdef USE_FREETYPE2
#include "graphics/fonts/ttf.h"
#endif
#include "backends/keymapper/keymapper.h"
@ -505,6 +508,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
MusicManager::destroy();
Graphics::CursorManager::destroy();
Graphics::FontManager::destroy();
#ifdef USE_FREETYPE2
Graphics::shutdownTTF();
#endif
return 0;
}

View File

@ -70,6 +70,10 @@ private:
bool _initialized;
};
void shutdownTTF() {
TTFLibrary::destroy();
}
#define g_ttf ::Graphics::TTFLibrary::instance()
TTFLibrary::TTFLibrary() : _library(), _initialized(false) {

View File

@ -34,6 +34,8 @@ namespace Graphics {
class Font;
Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome = false, const uint32 *mapping = 0);
void shutdownTTF();
} // End of namespace Graphics
#endif