diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-07-14 01:13:22 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-07-14 01:13:22 +0000 |
| commit | 0d53d5d423d8cea2823c13d27663d224592b58e1 (patch) | |
| tree | 90f0981451e1770d0a6fb7e7d010d43f82283043 /guilib | |
| parent | fd8e2ff6e4756fa887098060b8783f8fce396663 (diff) | |
fixed: compile warnings.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31782 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/GUIFontManager.cpp | 6 | ||||
| -rw-r--r-- | guilib/GUITextLayout.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/guilib/GUIFontManager.cpp b/guilib/GUIFontManager.cpp index 06560c6f3c..e3ab9f709a 100644 --- a/guilib/GUIFontManager.cpp +++ b/guilib/GUIFontManager.cpp @@ -87,7 +87,7 @@ CGUIFont* GUIFontManager::LoadTTF(const CStdString& strFontName, const CStdStrin if (sourceRes == RES_INVALID) // no source res specified, so assume the skin res sourceRes = m_skinResolution; - float newSize = iSize; + float newSize = (float)iSize; RescaleFontSizeAndAspect(&newSize, &aspect, sourceRes, preserveAspect); // First try to load the font from the skin @@ -142,7 +142,7 @@ CGUIFont* GUIFontManager::LoadTTF(const CStdString& strFontName, const CStdStrin } // font file is loaded, create our CGUIFont - CGUIFont *pNewFont = new CGUIFont(strFontName, iStyle, textColor, shadowColor, lineSpacing, iSize, pFontFile); + CGUIFont *pNewFont = new CGUIFont(strFontName, iStyle, textColor, shadowColor, lineSpacing, (float)iSize, pFontFile); m_vecFonts.push_back(pNewFont); // Store the original TTF font info in case we need to reload it in a different resolution @@ -201,7 +201,7 @@ void GUIFontManager::ReloadTTFFonts(void) OrigFontInfo fontInfo = m_vecFontInfo[i]; float aspect = fontInfo.aspect; - float newSize = fontInfo.size; + float newSize = (float)fontInfo.size; CStdString& strPath = fontInfo.fontFilePath; CStdString& strFilename = fontInfo.fileName; diff --git a/guilib/GUITextLayout.cpp b/guilib/GUITextLayout.cpp index 84a6a24126..3a69d0c8ad 100644 --- a/guilib/GUITextLayout.cpp +++ b/guilib/GUITextLayout.cpp @@ -571,7 +571,7 @@ void CGUITextLayout::DrawOutlineText(CGUIFont *font, float x, float y, const vec { if (outlineWidth) { - outlineWidth = outlineWidth * font->GetScaleFactor() + 0.5f; + outlineWidth = (int32_t)(outlineWidth * font->GetScaleFactor() + 0.5f); if (outlineWidth < 2) outlineWidth = 2; } |