[Scummvm-git-logs] scummvm master -> a18864c64624bc69168cc81c1d4bede207b218df

[sev-]

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

Summary:
bbfd43264a GRAPHICS: Drop offsets when scaling BDF fonts
a18864c646 GUI: Enable scaled BDF fonts


Commit: bbfd43264a603e58739d20068b6adf01d0d16b2b
    https://github.com/scummvm/scummvm/commit/bbfd43264a603e58739d20068b6adf01d0d16b2b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-26T15:05:32+02:00

Commit Message:
GRAPHICS: Drop offsets when scaling BDF fonts

Changed paths:
    graphics/fonts/bdf.cpp


diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp
index e7fba1f5437..69d1d3378ec 100644
--- a/graphics/fonts/bdf.cpp
+++ b/graphics/fonts/bdf.cpp
@@ -816,7 +816,7 @@ BdfFont *BdfFont::scaleFont(const BdfFont *src, int newSize) {
 			} else {
 				srcBoxWidth = src->_data.defaultBox.width;
 			}
-			src->scaleSingleGlyph(&srcSurf, dstGray, dstGraySize, box.width, box.height, srcBox.xOffset,  srcBox.yOffset, grayLevel, i + src->_data.firstCharacter,
+			src->scaleSingleGlyph(&srcSurf, dstGray, dstGraySize, box.width, box.height, 0, 0, grayLevel, i + src->_data.firstCharacter,
 								src->_data.height, srcBoxWidth, scale);
 
 			byte *ptr = bitmaps[i];


Commit: a18864c64624bc69168cc81c1d4bede207b218df
    https://github.com/scummvm/scummvm/commit/a18864c64624bc69168cc81c1d4bede207b218df
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-26T15:05:51+02:00

Commit Message:
GUI: Enable scaled BDF fonts

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index e81f9354e31..c1db060b543 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1780,7 +1780,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, cons
 	if (!font && allowNonScalable) {
 		font = loadFont(filename, fontName);
 
-		//font = Graphics::BdfFont::scaleFont((const Graphics::BdfFont *)font, pointsize);
+		font = Graphics::BdfFont::scaleFont((const Graphics::BdfFont *)font, pointsize);
 	}
 
 	// If the font is successfully loaded store it in the font manager.