[Scummvm-cvs-logs] scummvm master -> f9247f0bce0a6a6f658ddd6fe7b034f3855ffa77
anotherguest
larspson at gmail.com
Thu Apr 4 15:39:47 CEST 2013
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:
f9247f0bce WINTERMUTE: Use template with MIN
Commit: f9247f0bce0a6a6f658ddd6fe7b034f3855ffa77
https://github.com/scummvm/scummvm/commit/f9247f0bce0a6a6f658ddd6fe7b034f3855ffa77
Author: anotherguest (larspson at gmail.com)
Date: 2013-04-04T06:39:54-07:00
Commit Message:
WINTERMUTE: Use template with MIN
Changed paths:
engines/wintermute/base/file/base_package.cpp
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index 4434ed3..73f767c 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -61,7 +61,7 @@ static bool findPackageSignature(Common::SeekableReadStream *f, uint32 *offset)
uint32 bytesRead = startPos;
while (bytesRead < fileSize - 16) {
- uint32 toRead = MIN((unsigned int)32768, fileSize - bytesRead);
+ uint32 toRead = MIN<unsigned int>((unsigned int)32768, fileSize - bytesRead);
f->seek((int32)startPos, SEEK_SET);
uint32 actuallyRead = f->read(buf, toRead);
if (actuallyRead != toRead) {
More information about the Scummvm-git-logs
mailing list