[Scummvm-git-logs] scummvm master -> b94efab2017ccc290e06101d93ed480a570102c9

[orgads]

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:
b94efab201 SCUMM: MACGUI: Fix GCC warning


Commit: b94efab2017ccc290e06101d93ed480a570102c9
    https://github.com/scummvm/scummvm/commit/b94efab2017ccc290e06101d93ed480a570102c9
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-05-16T07:31:55+03:00

Commit Message:
SCUMM: MACGUI: Fix GCC warning

engines/scumm/macgui/macgui_impl.cpp: In member function 'Graphics::Surface* Scumm::MacGuiImpl::createRemappedSurface(const Graphics::Surface*, const byte*, int)':
engines/scumm/macgui/macgui_impl.cpp:589:31: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=]
  589 |                 paletteMap[i] = i;
      |                 ~~~~~~~~~~~~~~^~~
engines/scumm/macgui/macgui_impl.cpp:562:14: note: at offset [-2147483648, -1] into destination object 'paletteMap' of size 256
  562 |         byte paletteMap[256];
      |              ^~~~~~~~~~

Changed paths:
    engines/scumm/macgui/macgui_impl.cpp
    engines/scumm/macgui/macgui_impl.h


diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index 764757f813e..ad75e283388 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -555,7 +555,7 @@ bool MacGuiImpl::getFontParams(FontId fontId, int &id, int &size, int &slant) co
 	}
 }
 
-Graphics::Surface *MacGuiImpl::createRemappedSurface(const Graphics::Surface *surface, const byte *palette, int colorCount) {
+Graphics::Surface *MacGuiImpl::createRemappedSurface(const Graphics::Surface *surface, const byte *palette, uint colorCount) {
 	Graphics::Surface *s = new Graphics::Surface();
 	s->create(surface->w, surface->h, Graphics::PixelFormat::createFormatCLUT8());
 
@@ -572,7 +572,7 @@ Graphics::Surface *MacGuiImpl::createRemappedSurface(const Graphics::Surface *su
 		palette = monoPalette;
 	}
 
-	for (int i = 0; i < colorCount; i++) {
+	for (uint i = 0; i < colorCount; i++) {
 		int r = palette[3 * i];
 		int g = palette[3 * i + 1];
 		int b = palette[3 * i + 2];
@@ -585,13 +585,13 @@ Graphics::Surface *MacGuiImpl::createRemappedSurface(const Graphics::Surface *su
 
 	// Colors outside the palette are not remapped.
 
-	for (int i = colorCount; i < 256; i++)
+	for (uint i = colorCount; i < 256; i++)
 		paletteMap[i] = i;
 
 	if (palette) {
 		for (int y = 0; y < s->h; y++) {
 			for (int x = 0; x < s->w; x++) {
-				int color = surface->getPixel(x, y);
+				uint color = surface->getPixel(x, y);
 				if (color > colorCount)
 					color = getBlack();
 				else
diff --git a/engines/scumm/macgui/macgui_impl.h b/engines/scumm/macgui/macgui_impl.h
index 1bfb22ef391..a5b5ccd6816 100644
--- a/engines/scumm/macgui/macgui_impl.h
+++ b/engines/scumm/macgui/macgui_impl.h
@@ -243,7 +243,7 @@ protected:
 	void drawFakePathList(MacDialogWindow *window, Common::Rect r, const char *text);
 	void drawFakeDriveLabel(MacDialogWindow *window, Common::Rect r, const char *text);
 
-	Graphics::Surface *createRemappedSurface(const Graphics::Surface *surface, const byte *palette, int colorCount);
+	Graphics::Surface *createRemappedSurface(const Graphics::Surface *surface, const byte *palette, uint colorCount);
 
 public:
 	class MacGuiObject {