Sfoglia il codice sorgente

Manual cherry picking of pull request #392

Ivan Safrin 12 anni fa
parent
commit
ffe0ba5a39

+ 1 - 0
Core/Contents/Include/PolyFont.h

@@ -49,6 +49,7 @@ namespace Polycode {
 			String fileName;
 			String fileName;
 			String fontName;
 			String fontName;
 		
 		
+            FT_Library FTLibrary;        
 			unsigned char *buffer;
 			unsigned char *buffer;
 			bool valid;
 			bool valid;
 			FT_Face ftFace;
 			FT_Face ftFace;

+ 1 - 0
Core/Contents/Source/PolyCore.cpp

@@ -111,6 +111,7 @@ namespace Polycode {
 	Core::~Core() {
 	Core::~Core() {
 		printf("Shutting down core");
 		printf("Shutting down core");
 		delete services;
 		delete services;
+        delete input;
 	}
 	}
 	
 	
 	void Core::Shutdown() {	
 	void Core::Shutdown() {	

+ 8 - 1
Core/Contents/Source/PolyCoreServices.cpp

@@ -137,9 +137,16 @@ CoreServices::~CoreServices() {
 	delete resourceManager;
 	delete resourceManager;
 	delete soundManager;
 	delete soundManager;
 	delete fontManager;
 	delete fontManager;
+    delete logger;
+    delete config;
+    delete renderer;
+
+    for(std::size_t i = 0; i < modules.size(); i++) {
+        delete modules[i];
+    }
+    
 	instanceMap.clear();
 	instanceMap.clear();
 	overrideInstance = NULL;
 	overrideInstance = NULL;
-	
 }
 }
 
 
 void CoreServices::setCore(Core *core) {
 void CoreServices::setCore(Core *core) {

+ 1 - 1
Core/Contents/Source/PolyFont.cpp

@@ -30,7 +30,6 @@ Font::Font(const String& fileName) {
 
 
 	this->fileName = fileName;
 	this->fileName = fileName;
 
 
-	FT_Library FTLibrary;
 	FT_Init_FreeType(&FTLibrary);
 	FT_Init_FreeType(&FTLibrary);
 	
 	
 	loaded = false;
 	loaded = false;
@@ -79,6 +78,7 @@ Font::~Font() {
 	if(buffer) {
 	if(buffer) {
 		free(buffer);
 		free(buffer);
 	}
 	}
+    FT_Done_FreeType(FTLibrary);
 }
 }
 
 
 FT_Face Font::getFace() {
 FT_Face Font::getFace() {