Feature #922 » T922.patch
| include/exiv2/basicio.hpp (working copy) | ||
|---|---|---|
| 179 | 179 |
Nonzero if failure; |
| 180 | 180 |
*/ |
| 181 | 181 |
#if defined(_MSC_VER) |
| 182 |
virtual int seek(uint64_t offset, Position pos) = 0;
|
|
| 182 |
virtual int seek(int64_t offset, Position pos) = 0; |
|
| 183 | 183 |
#else |
| 184 | 184 |
virtual int seek(long offset, Position pos) = 0; |
| 185 | 185 |
#endif |
| ... | ... | |
| 448 | 448 |
Nonzero if failure; |
| 449 | 449 |
*/ |
| 450 | 450 |
#if defined(_MSC_VER) |
| 451 |
virtual int seek(uint64_t offset, Position pos);
|
|
| 451 |
virtual int seek(int64_t offset, Position pos); |
|
| 452 | 452 |
#else |
| 453 | 453 |
virtual int seek(long offset, Position pos); |
| 454 | 454 |
#endif |
| ... | ... | |
| 680 | 680 |
Nonzero if failure; |
| 681 | 681 |
*/ |
| 682 | 682 |
#if defined(_MSC_VER) |
| 683 |
virtual int seek(uint64_t offset, Position pos);
|
|
| 683 |
virtual int seek(int64_t offset, Position pos); |
|
| 684 | 684 |
#else |
| 685 | 685 |
virtual int seek(long offset, Position pos); |
| 686 | 686 |
#endif |
| ... | ... | |
| 1026 | 1026 |
Nonzero if failure; |
| 1027 | 1027 |
*/ |
| 1028 | 1028 |
#if defined(_MSC_VER) |
| 1029 |
virtual int seek(uint64_t offset, Position pos);
|
|
| 1029 |
virtual int seek(int64_t offset, Position pos); |
|
| 1030 | 1030 |
#else |
| 1031 | 1031 |
virtual int seek(long offset, Position pos); |
| 1032 | 1032 |
#endif |
| src/basicio.cpp (working copy) | ||
|---|---|---|
| 933 | 933 |
} |
| 934 | 934 | |
| 935 | 935 |
#if defined(_MSC_VER) |
| 936 |
int FileIo::seek( uint64_t offset, Position pos )
|
|
| 936 |
int FileIo::seek( int64_t offset, Position pos ) |
|
| 937 | 937 |
{
|
| 938 | 938 |
assert(p_->fp_ != 0); |
| 939 | 939 | |
| ... | ... | |
| 1249 | 1249 |
} |
| 1250 | 1250 | |
| 1251 | 1251 |
#if defined(_MSC_VER) |
| 1252 |
int MemIo::seek( uint64_t offset, Position pos )
|
|
| 1252 |
int MemIo::seek( int64_t offset, Position pos ) |
|
| 1253 | 1253 |
{
|
| 1254 | 1254 |
uint64_t newIdx = 0; |
| 1255 | 1255 | |
| ... | ... | |
| 1853 | 1853 |
} |
| 1854 | 1854 | |
| 1855 | 1855 |
#if defined(_MSC_VER) |
| 1856 |
int RemoteIo::seek( uint64_t offset, Position pos )
|
|
| 1856 |
int RemoteIo::seek( int64_t offset, Position pos ) |
|
| 1857 | 1857 |
{
|
| 1858 | 1858 |
assert(p_->isMalloced_); |
| 1859 | 1859 |
uint64_t newIdx = 0; |
| src/pngimage.cpp (working copy) | ||
|---|---|---|
| 157 | 157 |
int start = ::strlen(key); |
| 158 | 158 |
buff[start] = 0; |
| 159 | 159 |
if ( option == kpsXMP && ::strcmp((const char*)buff,key) == 0 ) {
|
| 160 |
io_->seek(-blen , BasicIo::cur); |
|
| 160 |
#if defined(_MSC_VER) |
|
| 161 |
io_->seek(-static_cast<int64_t>(blen) , BasicIo::cur); |
|
| 162 |
#else |
|
| 163 |
io_->seek(-static_cast<long>(blen) , BasicIo::cur); |
|
| 164 |
#endif |
|
| 161 | 165 |
dataOffset = dOff ; |
| 162 | 166 |
byte* xmp = new byte[dataOffset+5]; |
| 163 | 167 |
io_->read(xmp,dataOffset+4); |
