aboutsummaryrefslogtreecommitdiff
path: root/graphics/fonts/macfont.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2017-01-26 18:45:24 +0100
committerEugene Sandulenko2017-01-26 18:45:24 +0100
commitd99036a480eda3a0449215f7b240e0ee12aadaa1 (patch)
tree350b8307b590ccf8855c108caae44699ef047aa7 /graphics/fonts/macfont.cpp
parent1180f7a03f19f4c40378b62ff20fd49c3933e1b3 (diff)
downloadscummvm-rg350-d99036a480eda3a0449215f7b240e0ee12aadaa1.tar.gz
scummvm-rg350-d99036a480eda3a0449215f7b240e0ee12aadaa1.tar.bz2
scummvm-rg350-d99036a480eda3a0449215f7b240e0ee12aadaa1.zip
GRAPHICS: More fixes to MacFont scaling. Now it does work
Diffstat (limited to 'graphics/fonts/macfont.cpp')
-rw-r--r--graphics/fonts/macfont.cpp4
1 files 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;