diff options
author | Paul Gilbert | 2016-09-06 22:33:40 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-09-10 10:08:15 -0400 |
commit | c60a03019cb00649e19fa2c9baf289688237b90f (patch) | |
tree | 1da0bf5ade6ee80a636b47111b9d1a233fea28a2 /image/codecs/indeo/mem.cpp | |
parent | 9e774af4d91cb3adddfb6acc2024653620e725db (diff) | |
download | scummvm-rg350-c60a03019cb00649e19fa2c9baf289688237b90f.tar.gz scummvm-rg350-c60a03019cb00649e19fa2c9baf289688237b90f.tar.bz2 scummvm-rg350-c60a03019cb00649e19fa2c9baf289688237b90f.zip |
IMAGE: Cleanup and warning fixes for Indeo decoder
Diffstat (limited to 'image/codecs/indeo/mem.cpp')
-rw-r--r-- | image/codecs/indeo/mem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/image/codecs/indeo/mem.cpp b/image/codecs/indeo/mem.cpp index 53a3236cf6..88085aebdf 100644 --- a/image/codecs/indeo/mem.cpp +++ b/image/codecs/indeo/mem.cpp @@ -146,9 +146,10 @@ uint16 inv_bits(uint16 val, int nbits) { if (nbits <= 8) { res = ff_reverse[val] >> (8 - nbits); - } else + } else { res = ((ff_reverse[val & 0xFF] << 8) + (ff_reverse[val >> 8])) >> (16 - nbits); + } return res; } |