[Scummvm-cvs-logs] SF.net SVN: scummvm:[54145] scummvm/branches/branch-1-2-0/graphics/video/ coktel_decoder.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Mon Nov 8 18:05:05 CET 2010


Revision: 54145
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54145&view=rev
Author:   drmccoy
Date:     2010-11-08 17:05:05 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
VIDEO: Backport: PreIMD: End frame when stream depleted

As happens for the last frames in the Fascination videos.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp

Modified: scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp	2010-11-08 17:03:27 UTC (rev 54144)
+++ scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp	2010-11-08 17:05:05 UTC (rev 54145)
@@ -684,11 +684,11 @@
 }
 
 void PreIMDDecoder::processFrame() {
+	_curFrame++;
+
 	uint16 frameSize = _stream->readUint16LE();
-	if (frameSize == 0) {
-		_curFrame++;
+	if (_stream->eos() || (frameSize == 0))
 		return;
-	}
 
 	uint32 nextFramePos = _stream->pos() + frameSize + 2;
 
@@ -752,8 +752,6 @@
 	}
 
 	_stream->seek(nextFramePos);
-
-	_curFrame++;
 }
 
 // Just a simple blit


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list