thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IMAGE: Fix SMC decoder

Browse source 
It is a regression introduced in 6fb49b6595.
Because of this, we were not reading all the bytes from the source.
This commit is contained in:
Eugene Sandulenko 2021-08-10 20:50:59 +02:00
parent e84cdbd704
commit 8626c39b21
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
image/codecs/smc.cpp
View file

@ -135,10 +135,9 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
prevBlockPtr = prevBlockPtr1;
for (byte y = 0; y < 4; y++) {
for (byte x = 0; x < 4; x++) {
if (blockPtr >= pixelSize)
break;
pixels[blockPtr++] = pixels[prevBlockPtr++];
if (blockPtr < pixelSize)
pixels[blockPtr] = pixels[prevBlockPtr];
blockPtr++, prevBlockPtr++;
}
blockPtr += rowInc;
prevBlockPtr += rowInc;
@ -185,10 +184,9 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
for (byte y = 0; y < 4; y++) {
for (byte x = 0; x < 4; x++) {
if (blockPtr >= pixelSize)
break;
pixels[blockPtr++] = pixels[prevBlockPtr++];
if (blockPtr < pixelSize)
pixels[blockPtr] = pixels[prevBlockPtr];
blockPtr++, prevBlockPtr++;
}
blockPtr += rowInc;
@ -208,10 +206,9 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
blockPtr = rowPtr + pixelPtr;
for (byte y = 0; y < 4; y++) {
for (byte x = 0; x < 4; x++) {
if (blockPtr >= pixelSize)
break;
pixels[blockPtr++] = pixel;
if (blockPtr < pixelSize)
pixels[blockPtr] = pixel;
blockPtr++;
}
blockPtr += rowInc;
@ -258,10 +255,10 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
flagMask >>= 1;
if (blockPtr >= pixelSize)
break;
if (blockPtr < pixelSize)
pixels[blockPtr] = _colorPairs[pixel];
pixels[blockPtr++] = _colorPairs[pixel];
blockPtr++;
}
blockPtr += rowInc;
@ -307,10 +304,9 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
pixel = colorTableIndex + ((colorFlags >> flagMask) & 0x03);
flagMask -= 2;
if (blockPtr >= pixelSize)
break;
pixels[blockPtr++] = _colorQuads[pixel];
if (blockPtr < pixelSize)
pixels[blockPtr] = _colorQuads[pixel];
blockPtr++;
}
blockPtr += rowInc;
}
@ -375,10 +371,10 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
pixel = colorTableIndex + ((colorFlags >> flagMask) & 0x07);
flagMask -= 3;
if (blockPtr >= pixelSize)
break;
if (blockPtr < pixelSize)
pixels[blockPtr] = _colorOctets[pixel];
pixels[blockPtr++] = _colorOctets[pixel];
blockPtr++;
}
blockPtr += rowInc;
@ -395,10 +391,10 @@ const Graphics::Surface *SMCDecoder::decodeFrame(Common::SeekableReadStream &str
blockPtr = rowPtr + pixelPtr;
for (byte y = 0; y < 4; y++) {
for (byte x = 0; x < 4; x++) {
if (blockPtr >= pixelSize)
break;
pixels[blockPtr++] = stream.readByte();
byte b = stream.readByte();
if (blockPtr < pixelSize)
pixels[blockPtr] = b;
blockPtr++;
}
blockPtr += rowInc;