[Scummvm-cvs-logs] scummvm master -> 6890948f748d6b3c63314d8756b03bc4ec8660f8

wjp wjp at usecode.org
Thu Aug 25 02:46:20 CEST 2016


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:
6890948f74 DIRECTOR: Improve decoding compressed images


Commit: 6890948f748d6b3c63314d8756b03bc4ec8660f8
    https://github.com/scummvm/scummvm/commit/6890948f748d6b3c63314d8756b03bc4ec8660f8
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-08-25T02:46:08+02:00

Commit Message:
DIRECTOR: Improve decoding compressed images

Changed paths:
    engines/director/frame.cpp



diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 7412031..078f4eb 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -577,8 +577,12 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
 				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
-					img = new BITDDecoder(w /*+ 8*/, h, true);
+				} else if (w % 16 <= 8) {
+					// FIXME: This shouldn't actually increase the width of the surface, probably, but only affect the decoder
+					img = new BITDDecoder(w + 8, h, true);
+				} else {
+					img = new BITDDecoder(w, h, true);
+				}
 			} else {
 				img = new BITDDecoder(w, h, true);
 			}






More information about the Scummvm-git-logs mailing list