[Scummvm-git-logs] scummvm master -> 1ae0fe2d1ec9a25d95ef2976a4534a8c200a056b

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ae0fe2d1e GRAPHICS: Assume PICT are version 2 by default


Commit: 1ae0fe2d1ec9a25d95ef2976a4534a8c200a056b
    https://github.com/scummvm/scummvm/commit/1ae0fe2d1ec9a25d95ef2976a4534a8c200a056b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-11-22T07:10:20+01:00

Commit Message:
GRAPHICS: Assume PICT are version 2 by default

The version number decides if opcodes are 1 or 2 bytes, but we don't
know for sure which it is until the first opcode has been handled. But
the way the o_versionOp1 opcode is defined, we should recognize it it
regardless, so going from assumed version 2 to confirmed version 1
should be no problem. I do not have any test case to confirm this,
though.

What I do know is that going from assumed version 1 to confirmed version
2 does not work, so we want _version to be well defined (even if wrong)
from the beginning.

Changed paths:
    image/pict.cpp


diff --git a/image/pict.cpp b/image/pict.cpp
index 7ad657e69e8..392a6f298b3 100644
--- a/image/pict.cpp
+++ b/image/pict.cpp
@@ -38,6 +38,7 @@ namespace Image {
 PICTDecoder::PICTDecoder() {
 	_outputSurface = 0;
 	_paletteColorCount = 0;
+	_version = 2;
 }
 
 PICTDecoder::~PICTDecoder() {