[Scummvm-cvs-logs] scummvm master -> 16b65badc06b60d434f5f7bb0781b324f567e18c

[m-kiewitz]

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:
16b65badc0 SHERLOCK: 3DO: cel decoder change


Commit: 16b65badc06b60d434f5f7bb0781b324f567e18c
    https://github.com/scummvm/scummvm/commit/16b65badc06b60d434f5f7bb0781b324f567e18c
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-12T01:06:19+02:00

Commit Message:
SHERLOCK: 3DO: cel decoder change

Changed paths:
    engines/sherlock/image_file.cpp



diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index 3e11b09..265be52 100644
--- a/engines/sherlock/image_file.cpp
+++ b/engines/sherlock/image_file.cpp
@@ -348,6 +348,7 @@ static byte imagefile3DO_cel_bitsPerPixelLookupTable[8] = {
 
 // Reads a 3DO .cel/.anim file
 void ImageFile3DO::load3DOCelFile(Common::SeekableReadStream &stream) {
+	int32  streamSize = stream.size();
 	int32  chunkStartPos = 0;
 	uint32 chunkTag = 0;
 	uint32 chunkSize = 0;
@@ -379,7 +380,7 @@ void ImageFile3DO::load3DOCelFile(Common::SeekableReadStream &stream) {
 
 	memset(&plutRGBlookupTable, 0, sizeof(plutRGBlookupTable));
 
-	while (!stream.err() && !stream.eos()) {
+	while (!stream.err() && (stream.pos() < streamSize)) {
 		chunkStartPos = stream.pos();
 		chunkTag = stream.readUint32BE();
 		chunkSize = stream.readUint32BE();