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

[lephilousophe]

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:
cf61337968 CRYOMNI3D: Build fixes in HNM6 and APC decoders


Commit: cf613379684d5a312b32715213718c57d220a840
    https://github.com/scummvm/scummvm/commit/cf613379684d5a312b32715213718c57d220a840
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-30T11:43:06+02:00

Commit Message:
CRYOMNI3D: Build fixes in HNM6 and APC decoders

Changed paths:
    audio/decoders/apc.cpp
    image/codecs/hnm.cpp


diff --git a/audio/decoders/apc.cpp b/audio/decoders/apc.cpp
index ae5acd7b775..646bd92b718 100644
--- a/audio/decoders/apc.cpp
+++ b/audio/decoders/apc.cpp
@@ -34,7 +34,7 @@ namespace Audio {
 class APCStreamImpl : public APCStream {
 public:
 	// These parameters are completely optional and only used in HNM videos to make sure data is consistent
-	APCStreamImpl(uint sampleRate = uint(-1), byte stereo = byte(-1));
+	APCStreamImpl(uint32 sampleRate = uint(-1), byte stereo = byte(-1));
 
 	bool init(Common::SeekableReadStream &header) override;
 
diff --git a/image/codecs/hnm.cpp b/image/codecs/hnm.cpp
index d9bf1a9a74c..95aa707c368 100644
--- a/image/codecs/hnm.cpp
+++ b/image/codecs/hnm.cpp
@@ -1200,7 +1200,7 @@ void DecoderImpl::renderIWshortmo(Graphics::Surface &current, uint x, uint y) {
 	HNM6::doMotion<2, 2>(xform, current, current, srx, sry, x, y);
 }
 
-template<int sx, int sy, bool small = false>
+template<int sx, int sy, bool small>
 void DecoderImpl::renderIXkfMotion(Graphics::Surface &current, uint x, uint y) {
 	uint16 moword = _motion.next();
 
@@ -1235,7 +1235,7 @@ void DecoderImpl::renderSkip(Graphics::Surface &current, Graphics::Surface &prev
 	doMotion<sx, sy>(0, current, previous, x, y, x, y);
 }
 
-template<int sx, int sy, bool small = false>
+template<int sx, int sy, bool small>
 void DecoderImpl::renderIXifMotion(Graphics::Surface &current, Graphics::Surface &previous,
                                    uint x, uint y) {
 	uint16 moword = _motion.next();