[Scummvm-cvs-logs] scummvm master -> 224704ec8807ebaabc80b12dd9c60b666ffa11df

[wjp]

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:
224704ec88 DIRECTOR: Try to simplify uncompressed detection heuristic


Commit: 224704ec8807ebaabc80b12dd9c60b666ffa11df
    https://github.com/scummvm/scummvm/commit/224704ec8807ebaabc80b12dd9c60b666ffa11df
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-08-25T01:32:12+02:00

Commit Message:
DIRECTOR: Try to simplify uncompressed detection heuristic

Changed paths:
    engines/director/frame.cpp



diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 5313103..7412031 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -572,14 +572,12 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
 				debugC(4, kDebugImages, "%d, %d, %d", imgId, w, h);
 
 			if (true || bc->flags & 0x20) {
-				int w1 = w + 8 - w % 8 + 8;
-				debugC(3, kDebugImages, "Disabling compression for %d: %d x %d", imgId, w1, h);
+				int w1 = w + 16 - w % 16;
 
-				if (pic->size() * 8 == w1 * h)
+				if (pic->size() * 8 == w1 * h) {
+					debugC(3, kDebugImages, "Disabling compression for %d: %d x %d", imgId, w1, h);
 					img = new BITDDecoder(w1, h, false);
-				else if (pic->size() * 8 == (w1 + 8) * h)
-					img = new BITDDecoder(w1 + 8, h, false);
-				else
+				} else
 					img = new BITDDecoder(w /*+ 8*/, h, true);
 			} else {
 				img = new BITDDecoder(w, h, true);