diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-02-19 01:31:23 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-02-19 01:31:23 +0000 |
| commit | 418779caee7d9bfe7492cf667e5b2219a061cacf (patch) | |
| tree | e2792c44aacfcf1a55fa5aef44cef9c097e19fa1 /guilib | |
| parent | 0aa5678aec7c3c388789ec0a55375fb6c3147bfa (diff) | |
fixed: compile warnings
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27957 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/SkinInfo.cpp | 4 | ||||
| -rw-r--r-- | guilib/common/SDLJoystick.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/guilib/SkinInfo.cpp b/guilib/SkinInfo.cpp index 6d8df9cbfa..1318271151 100644 --- a/guilib/SkinInfo.cpp +++ b/guilib/SkinInfo.cpp @@ -146,7 +146,7 @@ void CSkinInfo::Load(const CStdString& strSkinDir) // get the skin zoom parameter. it's how much skin should be enlarged to get rid of overscan pChild = pRootElement->FirstChild("zoom"); if (pChild && pChild->FirstChild()) - m_skinzoom = atof(pChild->FirstChild()->Value()); + m_skinzoom = (float)atof(pChild->FirstChild()->Value()); else m_skinzoom = 1.0f; @@ -191,7 +191,7 @@ bool CSkinInfo::Check(const CStdString& strSkinDir) if (pChild) { float parsedVersion; - parsedVersion = atof(pChild->FirstChild()->Value()); + parsedVersion = (float)atof(pChild->FirstChild()->Value()); bVersionOK = parsedVersion >= SKIN_MIN_VERSION; CLog::Log(LOGINFO, "Skin version is: %s (%f)", pChild->FirstChild()->Value(), parsedVersion); diff --git a/guilib/common/SDLJoystick.cpp b/guilib/common/SDLJoystick.cpp index 46be90eb1a..8307d9654a 100644 --- a/guilib/common/SDLJoystick.cpp +++ b/guilib/common/SDLJoystick.cpp @@ -365,7 +365,7 @@ int CJoystick::GetAxisWithMaxAmount() axis = i; } } - SetAxisActive((bool)maxAmount); + SetAxisActive(0 != maxAmount); return axis; } |