[Scummvm-git-logs] scummvm master -> 797be02eb23a21a2a517cd80ccd220f7deac2ac4

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
797be02eb2 GRAPHICS: Fix MacFont association to MacFontFamily


Commit: 797be02eb23a21a2a517cd80ccd220f7deac2ac4
    https://github.com/scummvm/scummvm/commit/797be02eb23a21a2a517cd80ccd220f7deac2ac4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-25T19:41:53+01:00

Commit Message:
GRAPHICS: Fix MacFont association to MacFontFamily

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 2041797..4c8b9eb 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -170,10 +170,10 @@ void MacFontManager::loadFonts() {
 
 				Common::String familyName = fontFile->getResName(MKTAG('F', 'O', 'N', 'D'), *iterator);
 
-				Graphics::MacFontFamily fontFamily;
-				fontFamily.load(*fond);
+				Graphics::MacFontFamily *fontFamily = new MacFontFamily();
+				fontFamily->load(*fond);
 
-				Common::Array<Graphics::MacFontFamily::AsscEntry> *assoc = fontFamily.getAssocTable();
+				Common::Array<Graphics::MacFontFamily::AsscEntry> *assoc = fontFamily->getAssocTable();
 
 				for (uint i = 0; i < assoc->size(); i++) {
 					debug("size: %d style: %d id: %d", (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle,
@@ -195,7 +195,7 @@ void MacFontManager::loadFonts() {
 					}
 
 					font = new Graphics::MacFONTFont;
-					font->loadFont(*fontstream);
+					font->loadFont(*fontstream, fontFamily, (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle);
 
 					delete fontstream;