diff options
| author | Paul Gilbert | 2016-09-10 10:43:23 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-10 10:43:23 -0400 |
| commit | 9c7b9e166746a903dc0b7e87967ec257967e1359 (patch) | |
| tree | 4c7894550a9bb46d915cd3f22701041608b77100 /image/codecs/indeo/indeo.cpp | |
| parent | a6ffef9e26a10ddd23965fe2f6b5a7e7965fb22e (diff) | |
| download | scummvm-rg350-9c7b9e166746a903dc0b7e87967ec257967e1359.tar.gz scummvm-rg350-9c7b9e166746a903dc0b7e87967ec257967e1359.tar.bz2 scummvm-rg350-9c7b9e166746a903dc0b7e87967ec257967e1359.zip | |
IMAGE: Compilation fixes for Indeo4 decoder
Diffstat (limited to 'image/codecs/indeo/indeo.cpp')
| -rw-r--r-- | image/codecs/indeo/indeo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp index 69b9f4289b..2c11a09883 100644 --- a/image/codecs/indeo/indeo.cpp +++ b/image/codecs/indeo/indeo.cpp @@ -1304,7 +1304,7 @@ int IndeoDecoderBase::ivi_decode_coded_blocks(GetBits *gb, IVIBandDesc *band, col_flags[pos & col_mask] |= !!val; } - if (scan_pos < 0 || scan_pos >= num_coeffs && sym != rvmap->eob_sym) + if (scan_pos < 0 || (scan_pos >= num_coeffs && sym != rvmap->eob_sym)) return -1; // corrupt block data // undoing DC coeff prediction for intra-blocks @@ -1348,7 +1348,7 @@ int IndeoDecoderBase::ivi_dc_transform(IVIBandDesc *band, int *prev_dc, /*------------------------------------------------------------------------*/ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx) { - if (((w + 128) * (uint64)(h + 128)) < (INT_MAX / 8)) + if (((w + 128) * (uint64)(h + 128)) < (MAX_INTEGER / 8)) return 0; error("Picture size %ux%u is invalid", w, h); |