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

Merge pull request #2886 from Beep6581/HDRMergeMakerNotes

Browse Source 
Fix wrong handling of MakerNotes in dng files created with HDRMerge from Nikon NEF files
This commit is contained in:
Beep6581 2015-08-29 12:05:43 +02:00
commit 11d382d998
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtexif/rtexif.cc
View File

@ -1133,7 +1133,13 @@ bool Tag::parseMakerNote(FILE* f, int base, ByteOrder bom )
int basepos = ftell (f);
fread (value, 1, 18, f);
directory = new TagDirectory*[2];
directory[0] = new TagDirectory (parent, f, basepos + 10, nikon3Attribs, bom);
// byte order for makernotes can be different from exif byte order. We have to get it from makernotes header
ByteOrder MakerNoteOrder;
if(value[10] == 'M' && value[11] == 'M')
MakerNoteOrder = rtexif::MOTOROLA;
else
MakerNoteOrder = rtexif::INTEL;
directory[0] = new TagDirectory (parent, f, basepos + 10, nikon3Attribs, MakerNoteOrder);
directory[1] = NULL;
}
} else if ( make.find( "Canon" ) != std::string::npos ) {