[Scummvm-git-logs] scummvm master -> a51f5e9c1ad1b8f33fc4c569b479c9466f5a0502
digitall
547637+digitall at users.noreply.github.com
Wed May 5 10:36:34 UTC 2021
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:
a51f5e9c1a GRAPHICS: Fix GCC Compiler Warnings
Commit: a51f5e9c1ad1b8f33fc4c569b479c9466f5a0502
https://github.com/scummvm/scummvm/commit/a51f5e9c1ad1b8f33fc4c569b479c9466f5a0502
Author: D G Turner (digitall at scummvm.org)
Date: 2021-05-05T11:36:04+01:00
Commit Message:
GRAPHICS: Fix GCC Compiler Warnings
Changed paths:
graphics/macgui/mactext.cpp
graphics/surface.cpp
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 7af3b7f580..9a6dbc75b2 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -676,7 +676,7 @@ void MacText::render(int from, int to) {
debug(9, "MacText::render: line %d[%d] h:%d at %d,%d (%s) fontid: %d on %dx%d, fgcolor: %d bgcolor: %d, font: %p",
i, j, _textLines[i].height, xOffset, _textLines[i].y, _textLines[i].chunks[j].text.encode().c_str(),
_textLines[i].chunks[j].fontId, _surface->w, _surface->h, _textLines[i].chunks[j].fgcolor, _bgcolor,
- (void *)_textLines[i].chunks[j].getFont());
+ (const void *)_textLines[i].chunks[j].getFont());
if (_textLines[i].chunks[j].text.empty())
continue;
diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index 4345949d7c..a319767e8a 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -572,7 +572,7 @@ void Surface::debugPrint(int debuglevel, int width, int height, int x, int y, in
int tox = MIN<int>(x + width, w);
int toy = MIN<int>(y + height, h);
- debug(debuglevel, "Surface: %d x %d, bpp: %d, format: %s, address: %p", w, h, format.bytesPerPixel, format.toString().c_str(), (void *)this);
+ debug(debuglevel, "Surface: %d x %d, bpp: %d, format: %s, address: %p", w, h, format.bytesPerPixel, format.toString().c_str(), (const void *)this);
debug(debuglevel, "displaying: %d x %d @ %d,%d, scale: %d", width, height, x, y, scale);
debugN(debuglevel, "+");
for (int xx = x; xx < tox; xx += scale)
More information about the Scummvm-git-logs
mailing list