diff options
| author | Paul Gilbert | 2016-09-11 11:51:16 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-11 11:51:16 -0400 |
| commit | 71fd176f053520e34541d6c8be72214d9afb94ef (patch) | |
| tree | 94ef6cc57212424bf1bd6fb11a6fc8e0387dfa1a /image/codecs/indeo/indeo_dsp.cpp | |
| parent | 207afb6f462fadbe48d4ec298ce7c30ea5c874f0 (diff) | |
| download | scummvm-rg350-71fd176f053520e34541d6c8be72214d9afb94ef.tar.gz scummvm-rg350-71fd176f053520e34541d6c8be72214d9afb94ef.tar.bz2 scummvm-rg350-71fd176f053520e34541d6c8be72214d9afb94ef.zip | |
IMAGE: Compilation fixes for Indeo codecs
Diffstat (limited to 'image/codecs/indeo/indeo_dsp.cpp')
| -rw-r--r-- | image/codecs/indeo/indeo_dsp.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/image/codecs/indeo/indeo_dsp.cpp b/image/codecs/indeo/indeo_dsp.cpp index b095151036..95ce3f3bf5 100644 --- a/image/codecs/indeo/indeo_dsp.cpp +++ b/image/codecs/indeo/indeo_dsp.cpp @@ -73,7 +73,7 @@ namespace Indeo { void IndeoDSP::ffIviInverseHaar8x8(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) { - int tmp[64]; + int32 tmp[64]; int t0, t1, t2, t3, t4, t5, t6, t7, t8; // apply the InvHaar8 to all columns @@ -107,8 +107,8 @@ void IndeoDSP::ffIviInverseHaar8x8(const int32 *in, int16 *out, uint32 pitch, #define COMPENSATE(x) (x) src = tmp; for (int i = 0; i < 8; i++) { - if ( !src[0] && !src[1] && !src[2] && !src[3] - && !src[4] && !src[5] && !src[6] && !src[7]) { + if (!src[0] && !src[1] && !src[2] && !src[3] && + !src[4] && !src[5] && !src[6] && !src[7]) { memset(out, 0, 8 * sizeof(out[0])); } else { INV_HAAR8(src[0], src[1], src[2], src[3], @@ -176,7 +176,7 @@ void IndeoDSP::ffIviColHaar8(const int32 *in, int16 *out, uint32 pitch, void IndeoDSP::ffIviInverseHaar4x4(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) { - int tmp[16]; + int32 tmp[16]; int t0, t1, t2, t3, t4; // apply the InvHaar4 to all columns @@ -322,7 +322,7 @@ void IndeoDSP::ffIviDcHaar2d(const int32 *in, int16 *out, uint32 pitch, d4 = COMPENSATE(t4);} void IndeoDSP::ffIviInverseSlant8x8(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) { - int tmp[64]; + int32 tmp[64]; int t0, t1, t2, t3, t4, t5, t6, t7, t8; #define COMPENSATE(x) (x) @@ -359,7 +359,7 @@ void IndeoDSP::ffIviInverseSlant8x8(const int32 *in, int16 *out, uint32 pitch, c } void IndeoDSP::ffIviInverseSlant4x4(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) { - int tmp[16]; + int32 tmp[16]; int t0, t1, t2, t3, t4; #define COMPENSATE(x) (x) |