aboutsummaryrefslogtreecommitdiff
path: root/graphics/fonts/bdf.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-12 19:16:57 +0200
committerEugene Sandulenko2016-10-12 19:17:29 +0200
commit2cb0e45c630e568ef7a4c7b5f0f195f0d67f92ce (patch)
tree735fd99860bc419fe3b0958ee3c80532c9a8b883 /graphics/fonts/bdf.cpp
parenta89deafcad58912ce4c41490d226ce0da23830f3 (diff)
downloadscummvm-rg350-2cb0e45c630e568ef7a4c7b5f0f195f0d67f92ce.tar.gz
scummvm-rg350-2cb0e45c630e568ef7a4c7b5f0f195f0d67f92ce.tar.bz2
scummvm-rg350-2cb0e45c630e568ef7a4c7b5f0f195f0d67f92ce.zip
GRAPHICS: Further work on BDF font scaling
Diffstat (limited to 'graphics/fonts/bdf.cpp')
-rw-r--r--graphics/fonts/bdf.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp
index a783a22f5e..34155fcec1 100644
--- a/graphics/fonts/bdf.cpp
+++ b/graphics/fonts/bdf.cpp
@@ -701,6 +701,11 @@ BdfFont *BdfFont::loadFromCache(Common::SeekableReadStream &stream) {
}
BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) {
+ if (!src) {
+ warning("Emtpy font reference in scale font");
+ return NULL;
+ }
+
if (src->getFontSize()) {
warning("Requested to scale 0 size font");
return NULL;
@@ -720,6 +725,8 @@ BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) {
data.firstCharacter = src->_data.firstCharacter;
data.defaultCharacter = src->_data.defaultCharacter;
data.numCharacters = src->_data.numCharacters;
+ data.familyName = strdup(src->_data.familyName);
+ data.slant = strdup(src->_data.slant);
BdfBoundingBox *boxes = new BdfBoundingBox[data.numCharacters];
for (int i = 0; i < data.numCharacters; ++i) {