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

[digitall]

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:
c8bd7716ea KYRA: Fix GCC Signed vs Unsigned Compiler Warning in Assertion


Commit: c8bd7716ea3d5bb1a74f7ddeca5bcb539bee7dbf
    https://github.com/scummvm/scummvm/commit/c8bd7716ea3d5bb1a74f7ddeca5bcb539bee7dbf
Author: D G Turner (digitall at scummvm.org)
Date: 2021-11-10T09:38:23Z

Commit Message:
KYRA: Fix GCC Signed vs Unsigned Compiler Warning in Assertion

Changed paths:
    engines/kyra/sound/drivers/halestorm.cpp


diff --git a/engines/kyra/sound/drivers/halestorm.cpp b/engines/kyra/sound/drivers/halestorm.cpp
index 94f2e7eea3..157b7f179a 100644
--- a/engines/kyra/sound/drivers/halestorm.cpp
+++ b/engines/kyra/sound/drivers/halestorm.cpp
@@ -1568,9 +1568,9 @@ void HSLowLevelDriver::midiNoteOnOff(MidiTrackState *s, uint8 chan, uint8 note,
 	uint16 prg = (_songFlags & 0x800) ? s->program : _midiPartProgram[chan];
 
 	const uint8 *pos = _songData.ptr + 16;
-	int cnt = READ_BE_UINT16(pos);
+	uint16 cnt = READ_BE_UINT16(pos);
 	pos += 2;
-	assert(18 + cnt * 4 <= _songData.len);
+	assert(18 + cnt * 4 <= (int32)_songData.len);
 
 	while (cnt--) {
 		if (READ_BE_UINT16(pos) == prg) {