[Scummvm-git-logs] scummvm master -> 9c17c1cb46bd1cab7fe98d9a689ed16432609748

[sev-]

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

Summary:
9c17c1cb46 GRAPHICS: MACGUI: Fix compilation with debug output enabled in MacText


Commit: 9c17c1cb46bd1cab7fe98d9a689ed16432609748
    https://github.com/scummvm/scummvm/commit/9c17c1cb46bd1cab7fe98d9a689ed16432609748
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-13T00:14:48+02:00

Commit Message:
GRAPHICS: MACGUI: Fix compilation with debug output enabled in MacText

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 5aab73eabcf..1c165009b6a 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -858,7 +858,7 @@ void MacText::splitString(const Common::U32String &str, int curLine) {
 					chunk.palinfo3 = palinfo3;
 					chunk.fgcolor  = _wm->findBestColor(palinfo1 & 0xff, palinfo2 & 0xff, palinfo3 & 0xff);
 
-					D(9, "** splitString[: %08x", fgcolor);
+					D(9, "** splitString[: %08x", chunk.fgcolor);
 					break;
 					}
 
@@ -914,8 +914,8 @@ void MacText::splitString(const Common::U32String &str, int curLine) {
 
 					D(9, "** splitString[i]: %d%% fname: '%s'  alt: '%s'  title: '%s'",
 						_canvas._text[curLine].picpercent,
-						_canvas._text[curLine].picfname.c_str(), _canvas._text[curLine].picalt.c_str(),
-						_canvas._text[curLine].pictitle.c_str());
+						_canvas._text[curLine].picfname.c_str(), _canvas._text[curLine].picalt.encode().c_str(),
+						_canvas._text[curLine].pictitle.encode().c_str());
 					break;
 					}
 
@@ -1157,7 +1157,7 @@ void MacTextCanvas::render(int from, int to, int shadow) {
 
 		// TODO: _canvas._textMaxWidth, when -1, was not rendering ANY text.
 		for (int j = start; j != end; j += delta) {
-			debug(9, "MacText::render: line %d[%d] h:%d at %d,%d (%s) fontid: %d fontsize: %d on %dx%d, fgcolor: %08x bgcolor: %08x, font: %p",
+			D(9, "MacTextCanvas::render: line %d[%d] h:%d at %d,%d (%s) fontid: %d fontsize: %d on %dx%d, fgcolor: %08x bgcolor: %08x, font: %p",
 				  i, j, _text[i].height, xOffset, _text[i].y, _text[i].chunks[j].text.encode().c_str(),
 				  _text[i].chunks[j].fontId, _text[i].chunks[j].fontSize, _surface->w, _surface->h, _text[i].chunks[j].fgcolor, _bgcolor,
 				  (const void *)_text[i].chunks[j].getFont());