[Scummvm-git-logs] scummvm master -> 229f711ccd0a1da3f73e93d3f4ce249c93d3612f

[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:
bb5ea049d5 GRAPHICS: MACGUI: Constness fixes
229f711ccd GRAPHICS: MACGUI: Load MacFont TTF as monochrome


Commit: bb5ea049d5f9ecd879807116deebe4ccc97a88e4
    https://github.com/scummvm/scummvm/commit/bb5ea049d5f9ecd879807116deebe4ccc97a88e4
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-30T10:40:43+03:00

Commit Message:
GRAPHICS: MACGUI: Constness fixes

Changed paths:
    graphics/macgui/macfontmanager.cpp
    graphics/macgui/macfontmanager.h


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index ec6c475f945..27b63a47e07 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -638,7 +638,7 @@ const Common::String MacFontManager::getFontName(uint16 id, int size, int slant,
 	return Common::String::format("%s-%d-%d", n.c_str(), slant | extraSlant, size);
 }
 
-const Common::String MacFontManager::getFontName(MacFont &font) {
+const Common::String MacFontManager::getFontName(const MacFont &font) {
 	return getFontName(font.getId(), font.getSize(), font.getSlant());
 }
 
diff --git a/graphics/macgui/macfontmanager.h b/graphics/macgui/macfontmanager.h
index 06c6fa8f86e..c140665fde4 100644
--- a/graphics/macgui/macfontmanager.h
+++ b/graphics/macgui/macfontmanager.h
@@ -94,17 +94,17 @@ public:
 	void setId(int id) { _id = id; }
 	int getSize() const { return _size; }
 	int getSlant() const { return _slant; }
-	Common::String getName() { return _name; }
+	Common::String getName() const { return _name; }
 	void setName(Common::String &name) { setName(name.c_str()); }
 	void setName(const char *name);
-	const Graphics::Font *getFallback() { return _fallback; }
-	bool isGenerated() { return _generated; }
+	const Graphics::Font *getFallback() const { return _fallback; }
+	bool isGenerated() const { return _generated; }
 	void setGenerated(bool gen) { _generated = gen; }
-	bool isTrueType() { return _truetype; }
-	Font *getFont() { return _font; }
+	bool isTrueType() const { return _truetype; }
+	Font *getFont() const { return _font; }
 	void setFont(Font *font, bool truetype) { _font = font; _truetype = truetype; }
 	void setFallback(const Font *font, Common::String name = "");
-	Common::String getFallbackName() { return _fallbackName; }
+	Common::String getFallbackName() const { return _fallbackName; }
 
 private:
 	int _id;
@@ -147,7 +147,7 @@ public:
 	 * @return the font name or NULL if ID goes beyond the mapping
 	 */
 	const Common::String getFontName(uint16 id, int size, int slant = kMacFontRegular, bool tryGen = false);
-	const Common::String getFontName(MacFont &font);
+	const Common::String getFontName(const MacFont &font);
 	int getFontIdByName(Common::String name);
 
 	Common::Language getFontLanguage(uint16 id);


Commit: 229f711ccd0a1da3f73e93d3f4ce249c93d3612f
    https://github.com/scummvm/scummvm/commit/229f711ccd0a1da3f73e93d3f4ce249c93d3612f
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-30T10:40:43+03:00

Commit Message:
GRAPHICS: MACGUI: Load MacFont TTF as monochrome

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 27b63a47e07..613e9ddeff7 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -794,7 +794,7 @@ void MacFontManager::generateTTFFont(MacFont &toFont, Common::SeekableReadStream
 	// TODO: Handle getSlant() flags
 
 	stream->seek(0);
-	Font *font = Graphics::loadTTFFont(*stream, toFont.getSize());
+	Font *font = Graphics::loadTTFFont(*stream, toFont.getSize(), Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeMonochrome);
 
 	if (!font) {
 		warning("Failed to generate font '%s'", getFontName(toFont).c_str());