From 21e2a6de7b327136f241c2c95937c59103597dfc Mon Sep 17 00:00:00 2001 From: Christian Walther Date: Sat, 23 Aug 2014 21:10:55 +0200 Subject: [PATCH] Fix MSVC7 warnings. --- .../Sources/Plasma/PubUtilLib/plGImage/plFont.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp index caeb9606..4e8eacf3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp @@ -867,7 +867,7 @@ void plFont::IRenderChar8To32( const plFont::plCharacter &c ) // difference, especially since the dest pixels that we end up overlapping // should already be in the cache. If it does, time to upgrade the font // format (again) - thisWidth = fWidth;// + (Int32)c.fRightKern; + thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern; if( thisWidth >= fRenderInfo.fMaxWidth ) thisWidth = fRenderInfo.fMaxWidth; @@ -941,7 +941,7 @@ void plFont::IRenderChar8To32FullAlpha( const plFont::plCharacter &c ) // difference, especially since the dest pixels that we end up overlapping // should already be in the cache. If it does, time to upgrade the font // format (again) - thisWidth = fWidth;// + (Int32)c.fRightKern; + thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern; if( thisWidth >= fRenderInfo.fMaxWidth ) thisWidth = fRenderInfo.fMaxWidth; @@ -992,7 +992,7 @@ void plFont::IRenderChar8To32Alpha( const plFont::plCharacter &c ) // difference, especially since the dest pixels that we end up overlapping // should already be in the cache. If it does, time to upgrade the font // format (again) - thisWidth = fWidth;// + (Int32)c.fRightKern; + thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern; if( thisWidth >= fRenderInfo.fMaxWidth ) thisWidth = fRenderInfo.fMaxWidth; @@ -1052,7 +1052,7 @@ void plFont::IRenderChar8To32AlphaPremultiplied( const plFont::plCharacter &c ) // difference, especially since the dest pixels that we end up overlapping // should already be in the cache. If it does, time to upgrade the font // format (again) - thisWidth = fWidth;// + (Int32)c.fRightKern; + thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern; if( thisWidth >= fRenderInfo.fMaxWidth ) thisWidth = fRenderInfo.fMaxWidth; @@ -1110,7 +1110,7 @@ void plFont::IRenderChar8To32AlphaPremShadow( const plFont::plCharacter &c ) // difference, especially since the dest pixels that we end up overlapping // should already be in the cache. If it does, time to upgrade the font // format (again) - thisWidth = fWidth + 2;// + (Int32)c.fRightKern; + thisWidth = (Int16)fWidth + 2;// + (Int32)c.fRightKern; if( thisWidth >= fRenderInfo.fMaxWidth ) thisWidth = fRenderInfo.fMaxWidth;