[Scummvm-cvs-logs] scummvm master -> f17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7

[clone2727]

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:
f17b1bf4f0 COMMON: Fix opening QuickTime files from MacBinary files


Commit: f17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7
    https://github.com/scummvm/scummvm/commit/f17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-02-27T15:31:20-08:00

Commit Message:
COMMON: Fix opening QuickTime files from MacBinary files

Changed paths:
    common/quicktime.cpp



diff --git a/common/quicktime.cpp b/common/quicktime.cpp
index dbec7f7..248d8b2 100644
--- a/common/quicktime.cpp
+++ b/common/quicktime.cpp
@@ -66,7 +66,7 @@ bool QuickTimeParser::parseFile(const String &filename) {
 	_foundMOOV = false;
 	_disposeFileHandle = DisposeAfterUse::YES;
 
-	Atom atom = { 0, 0, 0xffffffff };
+	Atom atom = { 0, 0, 0 };
 
 	if (_resFork->hasResFork()) {
 		// Search for a 'moov' resource
@@ -80,14 +80,12 @@ bool QuickTimeParser::parseFile(const String &filename) {
 			if (readDefault(atom) < 0 || !_foundMOOV)
 				return false;
 		}
-		delete _fd;
 
-		atom.type = 0;
-		atom.offset = 0;
-		atom.size = 0xffffffff;
+		delete _fd;
 	}
 
 	_fd = _resFork->getDataFork();
+	atom.size = _fd->size();
 
 	if (readDefault(atom) < 0 || !_foundMOOV)
 		return false;