From c098453ea199ff4476bd3ada90200e2b90f4de58 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Sun, 3 Feb 2008 12:34:20 +0000
Subject: Added template param to CLIP since implicit cast is not working 100%
 on all platforms. Target type is int32 so used that.

svn-id: r30760
---
 sound/adpcm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sound')

diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp
index 4455288be4..ad072af360 100644
--- a/sound/adpcm.cpp
+++ b/sound/adpcm.cpp
@@ -297,7 +297,7 @@ int16 ADPCMInputStream::decodeOKI(byte code) {
 
 	_status.last = samp;
 	_status.stepIndex += stepAdjust(code);
-	_status.stepIndex = CLIP(_status.stepIndex, 0, ARRAYSIZE(okiStepSize) - 1);
+	_status.stepIndex = CLIP<int32>(_status.stepIndex, 0, ARRAYSIZE(okiStepSize) - 1);
 
 	// * 16 effectively converts 12-bit input to 16-bit output
 	return samp * 16;
@@ -326,7 +326,7 @@ int16 ADPCMInputStream::decodeMSIMA(byte code) {
 
 	_status.last = samp;
 	_status.stepIndex += stepAdjust(code);
-	_status.stepIndex = CLIP(_status.stepIndex, 0, ARRAYSIZE(imaStepTable) - 1);
+	_status.stepIndex = CLIP<int32>(_status.stepIndex, 0, ARRAYSIZE(imaStepTable) - 1);
 
 	return samp;
 }
-- 
cgit v1.2.3