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

[bluegr]

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

Summary:
08729a889d AUDIO: Fix compiler warning
d38bb8392b AUDIO: Use type casting in a more uniform way


Commit: 08729a889d40bc9ad7507cda8fb883049c73fc09
    https://github.com/scummvm/scummvm/commit/08729a889d40bc9ad7507cda8fb883049c73fc09
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-23T08:57:41+02:00

Commit Message:
AUDIO: Fix compiler warning

size_t and long are not the same on Win64.

Changed paths:
    audio/soundfont/vgmcoll.cpp


diff --git a/audio/soundfont/vgmcoll.cpp b/audio/soundfont/vgmcoll.cpp
index 647f489e44..546dad9467 100644
--- a/audio/soundfont/vgmcoll.cpp
+++ b/audio/soundfont/vgmcoll.cpp
@@ -185,7 +185,7 @@ SynthFile *VGMColl::CreateSynthFile(VGMInstrSet *theInstrSet) {
 				newRgn->SetWaveLinkInfo(0, 0, 1, (uint32) realSampNum);
 
 				if (realSampNum >= finalSamps.size()) {
-					debug("Sample %lu does not exist", realSampNum);
+					debug("Sample %u does not exist", unsigned(realSampNum));
 					realSampNum = finalSamps.size() - 1;
 				}
 


Commit: d38bb8392b07e984ff9c85b154bbad8e05ad363b
    https://github.com/scummvm/scummvm/commit/d38bb8392b07e984ff9c85b154bbad8e05ad363b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-03-23T08:57:41+02:00

Commit Message:
AUDIO: Use type casting in a more uniform way

Changed paths:
    audio/soundfont/vgmcoll.cpp


diff --git a/audio/soundfont/vgmcoll.cpp b/audio/soundfont/vgmcoll.cpp
index 546dad9467..18a00a1a4f 100644
--- a/audio/soundfont/vgmcoll.cpp
+++ b/audio/soundfont/vgmcoll.cpp
@@ -185,7 +185,7 @@ SynthFile *VGMColl::CreateSynthFile(VGMInstrSet *theInstrSet) {
 				newRgn->SetWaveLinkInfo(0, 0, 1, (uint32) realSampNum);
 
 				if (realSampNum >= finalSamps.size()) {
-					debug("Sample %u does not exist", unsigned(realSampNum));
+					debug("Sample %u does not exist", (uint32) realSampNum);
 					realSampNum = finalSamps.size() - 1;
 				}