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

Merge branch 'dev' of github.com:Beep6581/RawTherapee into dev

Browse Source
This commit is contained in:
Morgan Hardwood
2018-11-21 01:15:12 +01:00
parent bba0f72ddc 0e8069c1d8
commit add3d51719
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtexif/rtexif.cc
View File

@@ -2197,12 +2197,14 @@ void ExifManager::parseCIFF (int length, TagDirectory* root)
t = new Tag (root, lookupAttrib (ifdAttribs, "Make")); t = new Tag (root, lookupAttrib (ifdAttribs, "Make"));
t->initString (buffer); t->initString (buffer);
root->addTag (t); root->addTag (t);
fseek (f, strlen (buffer) - 63, SEEK_CUR); if (!fseek (f, strlen (buffer) - 63, SEEK_CUR)) {
fread (buffer, 64, 1, f); if (fread (buffer, 64, 1, f) == 1) {
t = new Tag (root, lookupAttrib (ifdAttribs, "Model")); t = new Tag (root, lookupAttrib (ifdAttribs, "Model"));
t->initString (buffer); t->initString (buffer);
root->addTag (t); root->addTag (t);
} }
}
}
if (type == 0x1818) { if (type == 0x1818) {
ev = int_to_float (get4 (f, INTEL)); ev = int_to_float (get4 (f, INTEL));