[Scummvm-cvs-logs] scummvm master -> 97854df1a8d5b322fab12bad11ad4c859a28062b

[clone2727]

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

Summary:
51b2904cc1 VIDEO: Improve a Cinepak heuristic
97854df1a8 README: Mark only the DOS EGA version of Loom as skipping copy protection


Commit: 51b2904cc12e5efe65b0d89faa2f296a8be77213
    https://github.com/scummvm/scummvm/commit/51b2904cc12e5efe65b0d89faa2f296a8be77213
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-11-14T15:30:54-08:00

Commit Message:
VIDEO: Improve a Cinepak heuristic

Brings it inline with the FFmpeg/libav version again

Changed paths:
    video/codecs/cinepak.cpp



diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp
index c197e0c..f457d83 100644
--- a/video/codecs/cinepak.cpp
+++ b/video/codecs/cinepak.cpp
@@ -87,10 +87,9 @@ const Graphics::Surface *CinepakDecoder::decodeImage(Common::SeekableReadStream
 	// Borrowed from FFMPEG. This should cut out the extra data Cinepak for Sega has (which is useless).
 	// The theory behind this is that this is here to confuse standard Cinepak decoders. But, we won't let that happen! ;)
 	if (_curFrame.length != (uint32)stream->size()) {
-		uint16 temp = stream->readUint16BE();
-		if (temp == 0xFE00)
+		if (stream->readUint16BE() == 0xFE00)
 			stream->readUint32BE();
-		else if (temp != _curFrame.width)
+		else if ((stream->size() % _curFrame.length) == 0)
 			stream->seek(-2, SEEK_CUR);
 	}
 


Commit: 97854df1a8d5b322fab12bad11ad4c859a28062b
    https://github.com/scummvm/scummvm/commit/97854df1a8d5b322fab12bad11ad4c859a28062b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-11-14T15:32:42-08:00

Commit Message:
README: Mark only the DOS EGA version of Loom as skipping copy protection

Changed paths:
    README



diff --git a/README b/README
index bbca0ec..2b68876 100644
--- a/README
+++ b/README
@@ -386,7 +386,7 @@ ScummVM will skip copy protection in the following games:
 
   * Maniac Mansion
   * Zak McKracken and the Alien Mindbenders
-  * Loom (EGA)
+  * Loom (EGA DOS)
   * The Secret of Monkey Island (VGA)
   * Monkey Island 2: LeChuck's Revenge
   * Beneath a Steel Sky