ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

IMAGE: correctly decode PICT images with offsets

Browse Source
This commit is contained in:
neuromancer
2026-02-26 23:11:53 +01:00
committed by Eugene Sandulenko
parent 777dd6e82d
commit c478c5c541
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/pict.cpp
+17 -5
View File
@@ -559,28 +559,40 @@ void PICTDecoder::unpackBits(Common::SeekableReadStream &stream, bool compressed
_outputSurface->create(_imageRect.width(), _imageRect.height(), Graphics::PixelFormat::createFormatCLUT8());
}
// Bounds rect: the bitmap's native coordinate space
int y1 = stream.readSint16BE();
int x1 = stream.readSint16BE();
int y2 = stream.readSint16BE();
int x2 = stream.readSint16BE();
stream.skip(8); // srcRect
stream.skip(8); // dstRect
// dstRect: where the bitmap maps to in the PICT's coordinate space.
// When bounds differs from picFrame (e.g., bitmap at screen coords
// mapped to picFrame origin), we need dstRect for correct placement.
int dstTop = stream.readSint16BE();
int dstLeft = stream.readSint16BE();
stream.skip(4); // dstBottom, dstRight (not needed)
stream.skip(2); // mode
if (hasRegion)
stream.skip(stream.readUint16BE() - 2);
// Compute offset: map bitmap coords (bounds) to output surface coords
// via dstRect and _imageRect (picFrame).
int yOff = dstTop - _imageRect.top - y1;
int xOff = dstLeft - _imageRect.left - x1;
Common::Rect outputRect(_outputSurface->w, _outputSurface->h);
if (!compressed) {
Common::BitStream8MSB bs(stream);
for (int y = y1; y < y2; y++) {
int yPos = y - _imageRect.top;
int yPos = y + yOff;
for (int x = x1; x < x2; x++) {
int xPos = x - _imageRect.left;
int xPos = x + xOff;
uint bit = bs.getBit();
@@ -593,7 +605,7 @@ void PICTDecoder::unpackBits(Common::SeekableReadStream &stream, bool compressed
}
for (int y = y1; y < y2; y++) {
int yPos = y - _imageRect.top;
int yPos = y + yOff;
int x = x1;
byte rowBytes = stream.readByte();
@@ -621,7 +633,7 @@ void PICTDecoder::unpackBits(Common::SeekableReadStream &stream, bool compressed
Common::BitStream8MSB bs(ms);
for (int i = 0; i < 8 * bufLen; i++) {
int xPos = x - _imageRect.left;
int xPos = x + xOff;
uint bit = bs.getBit();
if (outputRect.contains(xPos, yPos))