[Scummvm-git-logs] scummvm master -> 12df7f37677df332436f26583303f97341d4df01

[lephilousophe]

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:
12df7f3767 GRAPHICS: Fix uint vs uint32 discrepancies


Commit: 12df7f37677df332436f26583303f97341d4df01
    https://github.com/scummvm/scummvm/commit/12df7f37677df332436f26583303f97341d4df01
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-22T13:09:45+02:00

Commit Message:
GRAPHICS: Fix uint vs uint32 discrepancies

Changed paths:
    graphics/macgui/mactext.h
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index 37a52c77be6..e36297de58c 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -212,8 +212,8 @@ public:
 	int getTextSize(int start, int end);
 	void setTextSize(int textSize, int start, int end);
 
-	uint getTextColor() { return _defaultFormatting.fgcolor; }
-	uint getTextColor(int start, int end);
+	uint32 getTextColor() { return _defaultFormatting.fgcolor; }
+	uint32 getTextColor(int start, int end);
 
 	int getTextFont(int start, int end);
 	void setTextFont(int fontId, int start, int end);
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 1f0576d098e..f404557b5db 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -1306,13 +1306,13 @@ void MacWindowManager::passPalette(const byte *pal, uint size) {
 	setFullRefresh(true);
 }
 
-uint MacWindowManager::findBestColor(uint32 color) {
+uint32 MacWindowManager::findBestColor(uint32 color) {
 	byte r, g, b;
 	decomposeColor(color, r, g, b);
 	return _paletteLookup.findBestColor(r, g, b);
 }
 
-uint MacWindowManager::findBestColor(byte cr, byte cg, byte cb) {
+uint32 MacWindowManager::findBestColor(byte cr, byte cg, byte cb) {
 	if (_pixelformat.bytesPerPixel == 4)
 		return _pixelformat.RGBToColor(cr, cg, cb);