BASE: Free TTFLibrary singleton on shutdown.

This uses a helper function because TTFLibrary is internal.
scummvm · Mar 28, 2012 · b470c9a · b470c9a
1 parent 6d3927c
commit b470c9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/base/main.cpp b/base/main.cpp
@@ -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;
 }
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
@@ -70,6 +70,10 @@ class TTFLibrary : public Common::Singleton<TTFLibrary> {
 	bool _initialized;
 };
 
+void shutdownTTF() {
+	TTFLibrary::destroy();
+}
+
 #define g_ttf ::Graphics::TTFLibrary::instance()
 
 TTFLibrary::TTFLibrary() : _library(), _initialized(false) {

diff --git a/graphics/fonts/ttf.h b/graphics/fonts/ttf.h
@@ -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