diff options
| author | Thomas Fach-Pedersen | 2015-02-06 16:11:34 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-29 22:33:37 +0200 |
| commit | 420d7f9ecc1b2281b36e98c036d090ced3b8b891 (patch) | |
| tree | 5bd116e649193a22e4f1a1881b351abd26d2599f | |
| parent | 74a8b530f196233b287c9775e9c80774c4811058 (diff) | |
| download | scummvm-rg350-420d7f9ecc1b2281b36e98c036d090ced3b8b891.tar.gz scummvm-rg350-420d7f9ecc1b2281b36e98c036d090ced3b8b891.tar.bz2 scummvm-rg350-420d7f9ecc1b2281b36e98c036d090ced3b8b891.zip | |
BLADERUNNER: Remove commented out code
| -rw-r--r-- | engines/bladerunner/vqa_decoder.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp index 5c08284f40..a6e7e7c76b 100644 --- a/engines/bladerunner/vqa_decoder.cpp +++ b/engines/bladerunner/vqa_decoder.cpp @@ -650,7 +650,6 @@ bool VQADecoder::VQAVideoTrack::readCBFZ(Common::SeekableReadStream *s, uint32 s return true; } -#if 1 static int decodeZBUF_partial(uint8 *src, uint16 *curZBUF, uint32 srcLen) { @@ -694,13 +693,9 @@ int decodeZBUF_partial(uint8 *src, uint16 *curZBUF, uint32 srcLen) } return dstSize - dstRemain; } -#endif bool VQADecoder::VQAVideoTrack::readZBUF(Common::SeekableReadStream *s, uint32 size) { - // s->skip(roundup(size)); - // return true; -#if 1 if (size > _maxZBUFChunkSize) { debug("VQA ERROR: ZBUF chunk size: %08x > %08x", size, _maxZBUFChunkSize); s->skip(roundup(size)); @@ -725,12 +720,10 @@ bool VQADecoder::VQAVideoTrack::readZBUF(Common::SeekableReadStream *s, uint32 s _zbufChunkComplete = complete; _zbufChunkSize = remain; s->read(_zbufChunk, roundup(remain)); -#endif return true; } -#if 1 const uint16 *VQADecoder::VQAVideoTrack::decodeZBuffer() { if (_maxZBUFChunkSize == 0) @@ -738,11 +731,6 @@ const uint16 *VQADecoder::VQAVideoTrack::decodeZBuffer() if (!_zbuffer) _zbuffer = new uint16[_width * _height]; - // { - // if (!complete) { - // return false; - // } - // } if (_zbufChunkComplete) { size_t zbufOutSize; @@ -751,13 +739,8 @@ const uint16 *VQADecoder::VQAVideoTrack::decodeZBuffer() decodeZBUF_partial(_zbufChunk, _zbuffer, _zbufChunkSize); } - // if (!_zbuf) - // return false; - - // memcpy(zbuf, _zbuffer, 2 * _width * _height); return _zbuffer; } -#endif bool VQADecoder::VQAVideoTrack::readVIEW(Common::SeekableReadStream *s, uint32 size) { |