Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed: warning of type mismatches

  • Loading branch information...
commit 771e88242fd4d3afd122ad04d76348d009b72201 1 parent 01bf86e
@elupus elupus authored
View
4 xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp
@@ -103,7 +103,7 @@ bool CDVDSubtitleStream::Open(const string& strFile)
int CDVDSubtitleStream::Read(char* buf, int buf_size)
{
- return m_stringstream.readsome(buf, buf_size);
+ return (int)m_stringstream.readsome(buf, buf_size);
}
long CDVDSubtitleStream::Seek(long offset, int whence)
@@ -126,7 +126,7 @@ long CDVDSubtitleStream::Seek(long offset, int whence)
break;
}
}
- return m_stringstream.tellg();
+ return (int)m_stringstream.tellg();
}
char* CDVDSubtitleStream::ReadLine(char* buf, int iLen)
View
7 xbmc/music/tags/APEv2Tag.cpp
@@ -21,6 +21,7 @@
#include "APEv2Tag.h"
#include "filesystem/File.h"
+#include <climits>
using namespace XFILE;
@@ -49,7 +50,11 @@ int CAPEv2Tag::fseek_callback(void *fp, long int offset, int whence)
long CAPEv2Tag::ftell_callback(void *fp)
{
CFile *file = (CFile *)fp;
- return file->GetPosition();
+ int64_t pos = file->GetPosition();
+ if(pos > LONG_MAX)
+ return -1;
+ else
+ return (long)pos;
}
CAPEv2Tag::CAPEv2Tag()
Please sign in to comment.
Something went wrong with that request. Please try again.