Browse Source

Fix MSVC7 warnings.

textrendering
Christian Walther 10 years ago
parent
commit
21e2a6de7b
  1. 10
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp

10
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 // 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 // should already be in the cache. If it does, time to upgrade the font
// format (again) // format (again)
thisWidth = fWidth;// + (Int32)c.fRightKern; thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern;
if( thisWidth >= fRenderInfo.fMaxWidth ) if( thisWidth >= fRenderInfo.fMaxWidth )
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 // 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 // should already be in the cache. If it does, time to upgrade the font
// format (again) // format (again)
thisWidth = fWidth;// + (Int32)c.fRightKern; thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern;
if( thisWidth >= fRenderInfo.fMaxWidth ) if( thisWidth >= fRenderInfo.fMaxWidth )
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 // 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 // should already be in the cache. If it does, time to upgrade the font
// format (again) // format (again)
thisWidth = fWidth;// + (Int32)c.fRightKern; thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern;
if( thisWidth >= fRenderInfo.fMaxWidth ) if( thisWidth >= fRenderInfo.fMaxWidth )
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 // 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 // should already be in the cache. If it does, time to upgrade the font
// format (again) // format (again)
thisWidth = fWidth;// + (Int32)c.fRightKern; thisWidth = (Int16)fWidth;// + (Int32)c.fRightKern;
if( thisWidth >= fRenderInfo.fMaxWidth ) if( thisWidth >= fRenderInfo.fMaxWidth )
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 // 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 // should already be in the cache. If it does, time to upgrade the font
// format (again) // format (again)
thisWidth = fWidth + 2;// + (Int32)c.fRightKern; thisWidth = (Int16)fWidth + 2;// + (Int32)c.fRightKern;
if( thisWidth >= fRenderInfo.fMaxWidth ) if( thisWidth >= fRenderInfo.fMaxWidth )
thisWidth = fRenderInfo.fMaxWidth; thisWidth = fRenderInfo.fMaxWidth;

Loading…
Cancel
Save