mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-02-13 11:43:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #580 from TsudaKageyu/negative-seek

Browse Source 
Fix inconsistent negative seek behavior between Linux and Windows.
This commit is contained in:
Tsuda Kageyu
2015-08-07 01:32:26 +09:00
parent ec3d050adc 642baca4ed
commit 173c58cf49
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
taglib/toolkit/tfilestream.cpp
View File

@ -365,13 +365,10 @@ void FileStream::seek(long offset, Position p)
SetLastError(NO_ERROR);
SetFilePointer(d->file, offset, NULL, whence);
if(GetLastError() == ERROR_NEGATIVE_SEEK) {
SetLastError(NO_ERROR);
SetFilePointer(d->file, 0, NULL, FILE_BEGIN);
}
if(GetLastError() != NO_ERROR) {
const int lastError = GetLastError();
if(lastError != NO_ERROR && lastError != ERROR_NEGATIVE_SEEK)
debug("FileStream::seek() -- Failed to set the file pointer.");
}
#else
@ -442,7 +439,7 @@ long FileStream::length()
SetLastError(NO_ERROR);
const DWORD fileSize = GetFileSize(d->file, NULL);
if(GetLastError() == NO_ERROR) {
return static_cast<ulong>(fileSize);
return static_cast<long>(fileSize);
}
else {
debug("FileStream::length() -- Failed to get the file size.");