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

digitall noreply at scummvm.org
Sat Jul 23 18:01:31 UTC 2022


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:
f3b3d20f45 ICB: Fix Left Shift of Negative Value GCC Compiler Warning in NanoJPEG


Commit: f3b3d20f45e2f64c01e9c967cf33a86a79ea2932
    https://github.com/scummvm/scummvm/commit/f3b3d20f45e2f64c01e9c967cf33a86a79ea2932
Author: D G Turner (digitall at scummvm.org)
Date: 2022-07-23T19:00:18+01:00

Commit Message:
ICB: Fix Left Shift of Negative Value GCC Compiler Warning in NanoJPEG

This is emitted by GCC when -Wshift-negative-value is passed.

ICB has been tested and the jpeg backgrounds still decode as expected
with this change.

Changed paths:
    engines/icb/jpeg_decode.cpp


diff --git a/engines/icb/jpeg_decode.cpp b/engines/icb/jpeg_decode.cpp
index 18b3e5f1056..50a18270f64 100644
--- a/engines/icb/jpeg_decode.cpp
+++ b/engines/icb/jpeg_decode.cpp
@@ -421,7 +421,7 @@ static int njGetVLC(nj_vlc_code_t *vlc, byte *code) {
 		return 0;
 	value = njGetBits(bits);
 	if (value < (1 << (bits - 1)))
-		value += ((-1) << bits) + 1;
+		value += (0xffffffff << bits) + 1;
 	return value;
 }
 




More information about the Scummvm-git-logs mailing list