[Scummvm-git-logs] scummvm master -> 48dfb8d8212166a7004b3870ce6884f0452cfedb

[bluegr]

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

Summary:
4be6dd52aa IMAGE: Disable warning about using setjmp in C++ code
48dfb8d821 GRAPHICS: Fix negation of unsigned int warnings


Commit: 4be6dd52aa63ea9866ff0b3cac257c34189b90ca
    https://github.com/scummvm/scummvm/commit/4be6dd52aa63ea9866ff0b3cac257c34189b90ca
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2026-09-08T09:21:22+03:00

Commit Message:
IMAGE: Disable warning about using setjmp in C++ code

All of the types in loadStream are trivial so this is safe

Changed paths:
    image/jpeg.cpp


diff --git a/image/jpeg.cpp b/image/jpeg.cpp
index 617d4d434bc..7d18d2fdfe3 100644
--- a/image/jpeg.cpp
+++ b/image/jpeg.cpp
@@ -243,6 +243,12 @@ J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
 } // End of anonymous namespace
 #endif
 
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4611) // warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
+#endif
+
 bool JPEGDecoder::loadStream(Common::SeekableReadStream &stream) {
 #ifdef USE_JPEG
 	// Reset member variables from previous decodings
@@ -384,4 +390,8 @@ bool JPEGDecoder::loadStream(Common::SeekableReadStream &stream) {
 #endif
 }
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
 } // End of Graphics namespace


Commit: 48dfb8d8212166a7004b3870ce6884f0452cfedb
    https://github.com/scummvm/scummvm/commit/48dfb8d8212166a7004b3870ce6884f0452cfedb
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2026-09-08T09:21:22+03:00

Commit Message:
GRAPHICS: Fix negation of unsigned int warnings

Changed paths:
    graphics/blit/blit-alpha.cpp


diff --git a/graphics/blit/blit-alpha.cpp b/graphics/blit/blit-alpha.cpp
index 51622560389..4fdf7cfc40a 100644
--- a/graphics/blit/blit-alpha.cpp
+++ b/graphics/blit/blit-alpha.cpp
@@ -151,9 +151,9 @@ static inline bool alphaBlitHelper(byte *dst, const byte *src, const byte *mask,
 	if (flipy && flipx)
 		dstDelta = -dstDelta;
 	else if (flipy)
-		dstDelta = -((dstPitch * 2) - dstDelta);
+		dstDelta = -(static_cast<int>(dstPitch * 2) - dstDelta);
 	else if (flipx)
-		dstDelta =   (dstPitch * 2) - dstDelta;
+		dstDelta = static_cast<int>(dstPitch * 2) - dstDelta;
 
 	if (aMod == 0)
 		return true;
@@ -209,9 +209,9 @@ static inline bool alphaBlitMapHelper(byte *dst, const byte *src, const byte *ma
 	if (flipy && flipx)
 		dstDelta = -dstDelta;
 	else if (flipy)
-		dstDelta = -((dstPitch * 2) - dstDelta);
+		dstDelta = -(static_cast<int>(dstPitch * 2) - dstDelta);
 	else if (flipx)
-		dstDelta =   (dstPitch * 2) - dstDelta;
+		dstDelta = static_cast<int>(dstPitch * 2) - dstDelta;
 
 	// TODO: optimized cases for dstDelta of 0
 	if (dstFmt.bytesPerPixel == 2) {