iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a few places where 32-bit fseek/ftell were used in the Matroska reader code 

Originally committed to SVN as r6715.
This commit is contained in:
Thomas Goyne 2012-04-22 15:31:11 +00:00
parent 35241bdbce
commit b13c72e967
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aegisub/src/mkv_wrap.cpp
View File

@ -68,6 +68,14 @@ public:
#define CACHESIZE 65536 #define CACHESIZE 65536
#ifdef __VISUALC__
#define std_fseek _fseeki64
#define std_ftell _ftelli64
#else
#define std_fseek fseeko
#define std_ftell ftello
#endif
static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *input, bool srt, bool ssa, double totalTime, AssFile *target) { static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *input, bool srt, bool ssa, double totalTime, AssFile *target) {
std::map<int, wxString> subList; std::map<int, wxString> subList;
char *readBuf = 0; char *readBuf = 0;
@ -92,7 +100,7 @@ static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *
else if (frameSize == 0) else if (frameSize == 0)
continue; continue;
fseek(input->fp, filePos, SEEK_SET); std_fseek(input->fp, filePos, SEEK_SET);
fread(readBuf, 1, frameSize, input->fp); fread(readBuf, 1, frameSize, input->fp);
wxString blockString(readBuf, wxConvUTF8, frameSize); wxString blockString(readBuf, wxConvUTF8, frameSize);
@ -252,18 +260,10 @@ bool MatroskaWrapper::HasSubtitles(wxString const& filename) {
} }
} }
#ifdef __VISUALC__
#define std_fseek _fseeki64
#define std_ftell _ftelli64
#else
#define std_fseek fseeko
#define std_ftell ftello
#endif
int StdIoRead(InputStream *_st, ulonglong pos, void *buffer, int count) { int StdIoRead(InputStream *_st, ulonglong pos, void *buffer, int count) {
MkvStdIO *st = (MkvStdIO *) _st; MkvStdIO *st = (MkvStdIO *) _st;
size_t rd; size_t rd;
if (fseek(st->fp, pos, SEEK_SET)) { if (std_fseek(st->fp, pos, SEEK_SET)) {
st->error = errno; st->error = errno;
return -1; return -1;
} }