OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +00:00
Code Releases Activity

Update5 for MSVC10

Browse Source 
Funtion pointers use address of fully qualified name.
This commit is contained in:
Skoader
2012-04-22 13:21:52 +10:00
parent 7a501c1b1f
commit 5a1b5bf055
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp
View File

@ -336,22 +336,22 @@ void plFont::IRenderString( plMipmap *mip, UInt16 x, UInt16 y, const wchar_t *st
// Choose an optimal rendering function // Choose an optimal rendering function
fRenderInfo.fRenderFunc = nil; fRenderInfo.fRenderFunc = nil;
if( justCalc ) if( justCalc )
fRenderInfo.fRenderFunc = IRenderCharNull; fRenderInfo.fRenderFunc = &plFont::IRenderCharNull;
else if( mip->GetPixelSize() == 32 ) else if( mip->GetPixelSize() == 32 )
{ {
if( fBPP == 1 ) if( fBPP == 1 )
fRenderInfo.fRenderFunc = ( fRenderInfo.fFlags & kRenderScaleAA ) ? IRenderChar1To32AA : IRenderChar1To32; fRenderInfo.fRenderFunc = ( fRenderInfo.fFlags & kRenderScaleAA ) ? &plFont::IRenderChar1To32AA : &plFont::IRenderChar1To32;
else if( fBPP == 8 ) else if( fBPP == 8 )
{ {
if( fRenderInfo.fFlags & kRenderIntoAlpha ) if( fRenderInfo.fFlags & kRenderIntoAlpha )
{ {
if( ( fRenderInfo.fColor & 0xff000000 ) != 0xff000000 ) if( ( fRenderInfo.fColor & 0xff000000 ) != 0xff000000 )
fRenderInfo.fRenderFunc = IRenderChar8To32Alpha; fRenderInfo.fRenderFunc = &plFont::IRenderChar8To32Alpha;
else else
fRenderInfo.fRenderFunc = IRenderChar8To32FullAlpha; fRenderInfo.fRenderFunc = &plFont::IRenderChar8To32FullAlpha;
} }
else else
fRenderInfo.fRenderFunc = IRenderChar8To32; fRenderInfo.fRenderFunc = &plFont::IRenderChar8To32;
} }
} }
@ -537,7 +537,7 @@ void plFont::IRenderString( plMipmap *mip, UInt16 x, UInt16 y, const wchar_t *st
fRenderInfo.fX = 0; fRenderInfo.fX = 0;
CharRenderFunc oldFunc = fRenderInfo.fRenderFunc; CharRenderFunc oldFunc = fRenderInfo.fRenderFunc;
fRenderInfo.fRenderFunc = IRenderCharNull; fRenderInfo.fRenderFunc = &plFont::IRenderCharNull;
IRenderLoop( string, lastWord ); IRenderLoop( string, lastWord );
@ -559,7 +559,7 @@ void plFont::IRenderString( plMipmap *mip, UInt16 x, UInt16 y, const wchar_t *st
fRenderInfo.fX = 0; fRenderInfo.fX = 0;
CharRenderFunc oldFunc = fRenderInfo.fRenderFunc; CharRenderFunc oldFunc = fRenderInfo.fRenderFunc;
fRenderInfo.fRenderFunc = IRenderCharNull; fRenderInfo.fRenderFunc = &plFont::IRenderCharNull;
IRenderLoop( string, lastWord ); IRenderLoop( string, lastWord );
@ -658,7 +658,7 @@ void plFont::IRenderString( plMipmap *mip, UInt16 x, UInt16 y, const wchar_t *st
{ {
// Advance left past any clipping area // Advance left past any clipping area
CharRenderFunc oldFunc = fRenderInfo.fRenderFunc; CharRenderFunc oldFunc = fRenderInfo.fRenderFunc;
fRenderInfo.fRenderFunc = IRenderCharNull; fRenderInfo.fRenderFunc = &plFont::IRenderCharNull;
while( fRenderInfo.fX < fRenderInfo.fClipRect.fX && *string != 0 ) while( fRenderInfo.fX < fRenderInfo.fClipRect.fX && *string != 0 )
{ {
IRenderLoop( string, 1 ); IRenderLoop( string, 1 );