[Scummvm-git-logs] scummvm master -> 99a1a90e762e0647285b4c421ec118f5c086acb9

[digitall]

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

Summary:
2a2606f8fa HDB: Fix for GCC Warnings from 64-bit Stream API Changes
b5cd645fdb SAGA2: Fix for GCC Warnings from 64-bit Stream API Changes
99a1a90e76 AUDIO: Fix for GCC Warnings from 64-bit Stream API Changes


Commit: 2a2606f8fa25d07f8f6407989f7be4ef0f43b35c
    https://github.com/scummvm/scummvm/commit/2a2606f8fa25d07f8f6407989f7be4ef0f43b35c
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:21:49+01:00

Commit Message:
HDB: Fix for GCC Warnings from 64-bit Stream API Changes

Changed paths:
    engines/hdb/map.cpp


diff --git a/engines/hdb/map.cpp b/engines/hdb/map.cpp
index 71fc3a7a4c..faa6212fc3 100644
--- a/engines/hdb/map.cpp
+++ b/engines/hdb/map.cpp
@@ -307,7 +307,7 @@ bool Map::loadMap(char *name) {
 }
 
 bool Map::load(Common::SeekableReadStream *stream) {
-	debug(5, "map stream size: %d(%x)", stream->size(), stream->size());
+	debug(5, "map stream size: %ld(%lx)", stream->size(), stream->size());
 
 	// Load MSM data header
 	stream->read(_name, 32);


Commit: b5cd645fdb24938b89d16a111cff91ab713b902b
    https://github.com/scummvm/scummvm/commit/b5cd645fdb24938b89d16a111cff91ab713b902b
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:22:49+01:00

Commit Message:
SAGA2: Fix for GCC Warnings from 64-bit Stream API Changes

Changed paths:
    engines/saga2/sprite.cpp


diff --git a/engines/saga2/sprite.cpp b/engines/saga2/sprite.cpp
index f0f39044fe..bf063e34de 100644
--- a/engines/saga2/sprite.cpp
+++ b/engines/saga2/sprite.cpp
@@ -726,7 +726,7 @@ ActorAppearance *LoadActorAppearance(uint32 id, int16 banksNeeded) {
 		uint32 poseBytes = poseStream->size() - as->poseOffset;
 		const int poseSize = 14;
 
-		debugC(1, kDebugLoading, "Pose List: bytes: %d numAnimations: %d  poseOffset: %d calculated offset: %d numPoses: %d",
+		debugC(1, kDebugLoading, "Pose List: bytes: %ld numAnimations: %d  poseOffset: %d calculated offset: %d numPoses: %d",
 			poseStream->size(), as->numAnimations, as->poseOffset, 8 + as->numAnimations * 32, poseBytes / poseSize);
 
 		if (poseBytes % poseSize != 0)


Commit: 99a1a90e762e0647285b4c421ec118f5c086acb9
    https://github.com/scummvm/scummvm/commit/99a1a90e762e0647285b4c421ec118f5c086acb9
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:23:10+01:00

Commit Message:
AUDIO: Fix for GCC Warnings from 64-bit Stream API Changes

Changed paths:
    audio/decoders/qdm2.cpp


diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp
index d5eba536f2..203397b71a 100644
--- a/audio/decoders/qdm2.cpp
+++ b/audio/decoders/qdm2.cpp
@@ -2482,7 +2482,7 @@ void QDM2Stream::qdm2_synthesis_filter(uint8 index)
 }
 
 bool QDM2Stream::qdm2_decodeFrame(Common::SeekableReadStream &in, QueuingAudioStream *audioStream) {
-	debug(1, "QDM2Stream::qdm2_decodeFrame in.pos(): %d in.size(): %d", in.pos(), in.size());
+	debug(1, "QDM2Stream::qdm2_decodeFrame in.pos(): %ld in.size(): %ld", in.pos(), in.size());
 	int ch, i;
 	const int frame_size = (_sFrameSize * _channels);
 
@@ -2499,7 +2499,7 @@ bool QDM2Stream::qdm2_decodeFrame(Common::SeekableReadStream &in, QueuingAudioSt
 	}
 
 	if ((in.size() - in.pos()) < _packetSize) {
-		debug(1, "QDM2Stream::qdm2_decodeFrame Insufficient Packet Data in Input Stream Found: %d Need: %d", in.size() - in.pos(), _packetSize);
+		debug(1, "QDM2Stream::qdm2_decodeFrame Insufficient Packet Data in Input Stream Found: %ld Need: %d", in.size() - in.pos(), _packetSize);
 		return false;
 	}