[Scummvm-git-logs] scummvm master -> 3b2483969174ce8fc439cbbb3cfad0f088de0a9e

[lephilousophe]

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

Summary:
3b24839691 WINTERMUTE: Fix int vs int32 discrepancy


Commit: 3b2483969174ce8fc439cbbb3cfad0f088de0a9e
    https://github.com/scummvm/scummvm/commit/3b2483969174ce8fc439cbbb3cfad0f088de0a9e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-08-03T16:14:05+02:00

Commit Message:
WINTERMUTE: Fix int vs int32 discrepancy

Changed paths:
    engines/wintermute/base/font/base_font_truetype.cpp


diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 2d342acc141..8d8b1efe752 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -824,17 +824,17 @@ int32 BaseFontTT::wrapText(const WideString &text, int32 maxWidth, int32 maxHeig
 }
 
 //////////////////////////////////////////////////////////////////////////
-void BaseFontTT::measureText(const WideString &text, int32 maxWidth, int32 maxHeight, int32 &textWidth, int32 &textHeight) {
+void BaseFontTT::measureText(const WideString &text, int maxWidth, int maxHeight, int &textWidth, int &textHeight) {
 	TextLineList lines;
 	wrapText(text, maxWidth, maxHeight, lines);
 
-	textHeight = (int32)(lines.size() * getLineHeight());
+	textHeight = lines.size() * getLineHeight();
 	textWidth = 0;
 
 	TextLineList::iterator it;
 	for (it = lines.begin(); it != lines.end(); ++it) {
 		TextLine *line = (*it);
-		textWidth = MAX(textWidth, line->getWidth());
+		textWidth = MAX<int>(textWidth, line->getWidth());
 		SAFE_DELETE(line);
 	}
 }