[Scummvm-git-logs] scummvm master -> 788b002966ec4775a9b72952fb525c93b1f04883

[bluegr]

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

Summary:
944d566699 COMMON: Silence warning “unused variable”
9a03ef57ca SDL: Silence warning "unused function 'sdlGetAttribute'"
375a2091c8 IMAGE: Silence warning "'Image::JPEGDecoder::getPalette' hides overloaded virtual function"
788b002966 JANITORIAL: Fix comment


Commit: 944d5666993298d02047c574539be2f0ffeb347d
    https://github.com/scummvm/scummvm/commit/944d5666993298d02047c574539be2f0ffeb347d
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-05-17T22:40:06+03:00

Commit Message:
COMMON: Silence warning “unused variable”

Changed paths:
    common/archive.h


diff --git a/common/archive.h b/common/archive.h
index ebec6350f21..28c26246916 100644
--- a/common/archive.h
+++ b/common/archive.h
@@ -317,7 +317,6 @@ private:
 
 	mutable HashMap<CacheKey, SharedArchiveContents, CacheKey_Hash, CacheKey_EqualTo> _cache;
 	uint32 _maxStronglyCachedSize;
-	char _separator = '\0';
 };
 
 /**


Commit: 9a03ef57ca2e51a1ffe7875a790e7c30019d109e
    https://github.com/scummvm/scummvm/commit/9a03ef57ca2e51a1ffe7875a790e7c30019d109e
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-05-17T22:40:06+03:00

Commit Message:
SDL: Silence warning "unused function 'sdlGetAttribute'"

Changed paths:
    backends/graphics/openglsdl/openglsdl-graphics.cpp
    backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
    backends/platform/sdl/sdl.cpp


diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index cea895a460b..5bef5799d16 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -58,7 +58,7 @@ static bool sdlSetSwapInterval(int interval) {
 static bool sdlGetAttribute(SDL_GLAttr attr, int *value) {
 	return SDL_GL_GetAttribute(attr, value);
 }
-#else
+#elif !USE_FORCED_GL && !USE_FORCED_GLES && !USE_FORCED_GLES2
 static bool sdlGetAttribute(SDL_GLattr attr, int *value) {
 	return SDL_GL_GetAttribute(attr, value) == 0;
 }
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
index 41ffd680d59..6f3fde9e509 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -50,7 +50,7 @@
 static bool sdlGetAttribute(SDL_GLAttr attr, int *value) {
 	return SDL_GL_GetAttribute(attr, value);
 }
-#else
+#elif !USE_FORCED_GLES2
 static bool sdlGetAttribute(SDL_GLattr attr, int *value) {
 	return SDL_GL_GetAttribute(attr, value) == 0;
 }
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 4beb4c22961..92b920896fe 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -83,7 +83,7 @@
 static bool sdlGetAttribute(SDL_GLAttr attr, int *value) {
 	return SDL_GL_GetAttribute(attr, value);
 }
-#elif SDL_VERSION_ATLEAST(2, 0, 0)
+#elif SDL_VERSION_ATLEAST(2, 0, 0) && !USE_FORCED_GLES2
 static bool sdlGetAttribute(SDL_GLattr attr, int *value) {
 	return SDL_GL_GetAttribute(attr, value) == 0;
 }


Commit: 375a2091c8880a31acaf5b1417a288dd94d75bfe
    https://github.com/scummvm/scummvm/commit/375a2091c8880a31acaf5b1417a288dd94d75bfe
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-05-17T22:40:06+03:00

Commit Message:
IMAGE: Silence warning "'Image::JPEGDecoder::getPalette' hides overloaded virtual function"

Changed paths:
    image/jpeg.h


diff --git a/image/jpeg.h b/image/jpeg.h
index 912bde9a48b..0a689fd2322 100644
--- a/image/jpeg.h
+++ b/image/jpeg.h
@@ -105,6 +105,8 @@ public:
 	void setOutputColorSpace(ColorSpace outSpace) { _colorSpace = outSpace; }
 
 private:
+	// TODO: Avoid inheriting from multiple superclasses that have identically functions.
+	using Codec::getPalette;
 	Graphics::Surface _surface;
 	Graphics::Palette _palette;
 	ColorSpace _colorSpace;


Commit: 788b002966ec4775a9b72952fb525c93b1f04883
    https://github.com/scummvm/scummvm/commit/788b002966ec4775a9b72952fb525c93b1f04883
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-05-17T22:40:06+03:00

Commit Message:
JANITORIAL: Fix comment

Changed paths:
    image/jpeg.h


diff --git a/image/jpeg.h b/image/jpeg.h
index 0a689fd2322..80f2dd8163d 100644
--- a/image/jpeg.h
+++ b/image/jpeg.h
@@ -105,7 +105,7 @@ public:
 	void setOutputColorSpace(ColorSpace outSpace) { _colorSpace = outSpace; }
 
 private:
-	// TODO: Avoid inheriting from multiple superclasses that have identically functions.
+	// TODO: Avoid inheriting from multiple superclasses that have identical member functions.
 	using Codec::getPalette;
 	Graphics::Surface _surface;
 	Graphics::Palette _palette;