From ce89406b9a7e68acefae307281dc98e97a7bca88 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 12 Oct 2016 23:27:50 +0200 Subject: GRAPHICS: Fix BDF font referencing on font generation --- graphics/fonts/bdf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics/fonts/bdf.cpp') diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp index 34155fcec1..93b64d8225 100644 --- a/graphics/fonts/bdf.cpp +++ b/graphics/fonts/bdf.cpp @@ -706,7 +706,7 @@ BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) { return NULL; } - if (src->getFontSize()) { + if (src->getFontSize() == 0) { warning("Requested to scale 0 size font"); return NULL; } @@ -735,11 +735,13 @@ BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) { boxes[i].xOffset = src->_data.boxes[i].xOffset; boxes[i].yOffset = src->_data.boxes[i].yOffset; } + data.boxes = boxes; byte *advances = new byte[data.numCharacters]; for (int i = 0; i < data.numCharacters; ++i) { advances[i] = src->_data.advances[i]; } + data.advances = advances; byte **bitmaps = new byte *[data.numCharacters]; @@ -758,8 +760,6 @@ BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) { } data.bitmaps = bitmaps; - data.advances = advances; - data.boxes = boxes; return new BdfFont(data, DisposeAfterUse::YES); } -- cgit v1.2.3