From d99036a480eda3a0449215f7b240e0ee12aadaa1 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 26 Jan 2017 18:45:24 +0100 Subject: GRAPHICS: More fixes to MacFont scaling. Now it does work --- graphics/fonts/macfont.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp index 820936ca07..601962ff8b 100644 --- a/graphics/fonts/macfont.cpp +++ b/graphics/fonts/macfont.cpp @@ -412,7 +412,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize) { data._fontType = src->_data._fontType; data._firstChar = src->_data._firstChar; - data._lastChar = src->_data._firstChar; + data._lastChar = src->_data._lastChar; data._maxWidth = (int)((float)src->_data._maxWidth * scale); data._kernMax = (int)((float)src->_data._kernMax * scale); data._nDescent = (int)((float)src->_data._nDescent * scale); @@ -445,7 +445,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize) { data._rowWords = newBitmapWidth; - uint16 bitImageSize = data._rowWords * data._fRectHeight; + uint bitImageSize = data._rowWords * data._fRectHeight; data._bitImage = new byte[bitImageSize]; int srcPitch = src->_data._rowWords; -- cgit v1.2.3