[Scummvm-cvs-logs] scummvm master -> 7807bcb76ba25879268dfe30b61f2bf64c7abd7f

[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:
7807bcb76b AGI: Fix warning


Commit: 7807bcb76ba25879268dfe30b61f2bf64c7abd7f
    https://github.com/scummvm/scummvm/commit/7807bcb76ba25879268dfe30b61f2bf64c7abd7f
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-09T20:22:06+01:00

Commit Message:
AGI: Fix warning

Changed paths:
    engines/agi/font.cpp



diff --git a/engines/agi/font.cpp b/engines/agi/font.cpp
index 5c5ea51..896befc 100644
--- a/engines/agi/font.cpp
+++ b/engines/agi/font.cpp
@@ -831,7 +831,8 @@ void GfxFont::loadFontAmigaPseudoTopaz() {
 			topazByteOffset = topazBitOffset >> 3;
 
 			// Security check, although we are working on static const data from within ScummVM
-			assert((topazByteOffset + ((topazHeight - 1) * topazModulo)) < sizeof(fontData_AmigaPseudoTopaz));
+			uint maxOffset = (topazByteOffset + ((topazHeight - 1) * topazModulo));
+			assert(maxOffset < sizeof(fontData_AmigaPseudoTopaz));
 
 			for (uint16 curHeight = 0; curHeight < topazHeight; curHeight++) {
 				*fontData = topazData[topazByteOffset];