diff options
Diffstat (limited to 'image/codecs/indeo4.cpp')
| -rw-r--r-- | image/codecs/indeo4.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/image/codecs/indeo4.cpp b/image/codecs/indeo4.cpp index b6ac0882e7..4658068b27 100644 --- a/image/codecs/indeo4.cpp +++ b/image/codecs/indeo4.cpp @@ -484,8 +484,8 @@ int Indeo4Decoder::decodeMbInfo(IVIBandDesc *band, IVITile *tile) { mb->_qDelta = 0; if (!band->_plane && !band->_bandNum && _ctx._inQ) { - mb->_qDelta = _ctx._gb->getVLC2(_ctx._mbVlc._tab->_table, - IVI_VLC_BITS, 1); + mb->_qDelta = _ctx._gb->getVLC2<1>(_ctx._mbVlc._tab->_table, + IVI_VLC_BITS); mb->_qDelta = IVI_TOSIGNED(mb->_qDelta); } @@ -522,8 +522,8 @@ int Indeo4Decoder::decodeMbInfo(IVIBandDesc *band, IVITile *tile) { if (refMb) mb->_qDelta = refMb->_qDelta; } else if (mb->_cbp || (!band->_plane && !band->_bandNum && _ctx._inQ)) { - mb->_qDelta = _ctx._gb->getVLC2(_ctx._mbVlc._tab->_table, - IVI_VLC_BITS, 1); + mb->_qDelta = _ctx._gb->getVLC2<1>(_ctx._mbVlc._tab->_table, + IVI_VLC_BITS); mb->_qDelta = IVI_TOSIGNED(mb->_qDelta); } @@ -543,22 +543,22 @@ int Indeo4Decoder::decodeMbInfo(IVIBandDesc *band, IVITile *tile) { } } else { // decode motion vector deltas - mvDelta = _ctx._gb->getVLC2(_ctx._mbVlc._tab->_table, - IVI_VLC_BITS, 1); + mvDelta = _ctx._gb->getVLC2<1>(_ctx._mbVlc._tab->_table, + IVI_VLC_BITS); mvY += IVI_TOSIGNED(mvDelta); - mvDelta = _ctx._gb->getVLC2(_ctx._mbVlc._tab->_table, - IVI_VLC_BITS, 1); + mvDelta = _ctx._gb->getVLC2<1>(_ctx._mbVlc._tab->_table, + IVI_VLC_BITS); mvX += IVI_TOSIGNED(mvDelta); mb->_mvX = mvX; mb->_mvY = mvY; if (mb->_type == 3) { - mvDelta = _ctx._gb->getVLC2( + mvDelta = _ctx._gb->getVLC2<1>( _ctx._mbVlc._tab->_table, - IVI_VLC_BITS, 1); + IVI_VLC_BITS); mvY += IVI_TOSIGNED(mvDelta); - mvDelta = _ctx._gb->getVLC2( + mvDelta = _ctx._gb->getVLC2<1>( _ctx._mbVlc._tab->_table, - IVI_VLC_BITS, 1); + IVI_VLC_BITS); mvX += IVI_TOSIGNED(mvDelta); mb->_bMvX = -mvX; mb->_bMvY = -mvY; |