liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fseek()/ftell() issue

Browse Source
This commit is contained in:
Flössie
2019-12-06 09:18:16 +01:00
parent 8f82a8362a
commit 03c094a42b
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/canon_cr3_decoder.cc
View File

@@ -449,9 +449,9 @@ int DCraw::parseCR3(
goto fin;
}
const std::int64_t off = ftell(ifp); // FIXME: ftell() returns int
const long off = ftell(ifp);
parse_gps(oAtomContent);
fseek(ifp, off, SEEK_SET); // FIXME: fseek() takes int offset
fseek(ifp, off, SEEK_SET);
// parse_gps_libraw(oAtomContent);
order = q_order;
} else if (!strcmp(AtomNameStack, "moovtrakmdiahdlr")) {
@@ -468,7 +468,7 @@ int DCraw::parseCR3(
}
} else if (!strcmp(AtomNameStack, "moovtrakmdiaminfstblstsd")) {
if (szAtomContent >= 16) {
fseek(ifp, 12L, SEEK_CUR);
fseek(ifp, 12, SEEK_CUR);
lHdr = 8;
} else {
err = -7;
@@ -670,7 +670,7 @@ struct LibRaw_abstract_datastream {
void unlock()
{
}
void seek(int p, int how)
void seek(long p, int how)
{
fseek(ifp, p, how);
}