diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-07-01 12:11:42 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-07-01 12:11:42 +1200 |
| commit | 49cf5c0c3a157d48df31fdd832b43cef763856e9 (patch) | |
| tree | 2f1ad2b91e12c9ec10013ca7ef662cc9bbb8df39 | |
| parent | 1f4dd1fe881fe768afcf71bc4bf14bbb74e65476 (diff) | |
fix compile warnings
| -rw-r--r-- | xbmc/dialogs/GUIDialogKeyboard.cpp | 2 | ||||
| -rw-r--r-- | xbmc/filesystem/CacheMemBuffer.cpp | 2 | ||||
| -rw-r--r-- | xbmc/filesystem/SAPFile.cpp | 2 | ||||
| -rw-r--r-- | xbmc/windows/GUIWindowScreensaverDim.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/dialogs/GUIDialogKeyboard.cpp b/xbmc/dialogs/GUIDialogKeyboard.cpp index 6ad3b89b0a..0914228181 100644 --- a/xbmc/dialogs/GUIDialogKeyboard.cpp +++ b/xbmc/dialogs/GUIDialogKeyboard.cpp @@ -772,5 +772,5 @@ void CGUIDialogKeyboard::SetHeading(const CVariant &heading) if (heading.isString()) m_strHeading = heading.asString(); else if (heading.isInteger() && heading.asInteger()) - m_strHeading = g_localizeStrings.Get(heading.asInteger()); + m_strHeading = g_localizeStrings.Get((uint32_t)heading.asInteger()); } diff --git a/xbmc/filesystem/CacheMemBuffer.cpp b/xbmc/filesystem/CacheMemBuffer.cpp index 228f0aa139..59db6a067f 100644 --- a/xbmc/filesystem/CacheMemBuffer.cpp +++ b/xbmc/filesystem/CacheMemBuffer.cpp @@ -161,7 +161,7 @@ int64_t CacheMemBuffer::Seek(int64_t iFilePosition) // check if seek is inside the current buffer if (iFilePosition >= m_nStartPosition && iFilePosition < m_nStartPosition + m_buffer.getMaxReadSize()) { - unsigned int nOffset = (iFilePosition - m_nStartPosition); + unsigned int nOffset = (unsigned int)(iFilePosition - m_nStartPosition); // copy to history so we can seek back if (m_HistoryBuffer.getMaxWriteSize() < nOffset) m_HistoryBuffer.SkipBytes(nOffset); diff --git a/xbmc/filesystem/SAPFile.cpp b/xbmc/filesystem/SAPFile.cpp index 333f94d246..df31b08776 100644 --- a/xbmc/filesystem/SAPFile.cpp +++ b/xbmc/filesystem/SAPFile.cpp @@ -109,7 +109,7 @@ int CSAPFile::Stat(const CURL& url, struct __stat64* buffer) unsigned int CSAPFile::Read(void *lpBuf, int64_t uiBufSize) { - return m_stream.readsome((char*)lpBuf, (streamsize)uiBufSize); + return (unsigned int)m_stream.readsome((char*)lpBuf, (streamsize)uiBufSize); } void CSAPFile::Close() diff --git a/xbmc/windows/GUIWindowScreensaverDim.cpp b/xbmc/windows/GUIWindowScreensaverDim.cpp index 21fdf0a640..85b3b99a64 100644 --- a/xbmc/windows/GUIWindowScreensaverDim.cpp +++ b/xbmc/windows/GUIWindowScreensaverDim.cpp @@ -54,7 +54,7 @@ void CGUIWindowScreensaverDim::UpdateVisibility() void CGUIWindowScreensaverDim::Process(unsigned int currentTime, CDirtyRegionList &dirtyregions) { CGUIDialog::Process(currentTime, dirtyregions); - m_renderRegion.SetRect(0, 0, g_graphicsContext.GetWidth(), g_graphicsContext.GetHeight()); + m_renderRegion.SetRect(0, 0, (float)g_graphicsContext.GetWidth(), (float)g_graphicsContext.GetHeight()); } void CGUIWindowScreensaverDim::Render() |