Author: post Date: 2012-09-30 18:39:54 +0200 (Sun, 30 Sep 2012) New Revision: 461
Modified: RawSpeed/NefDecoder.cpp Log: Allow Nikon makernotes to be within the entire file. (Fixes D700 with invalid maker notes) Modified: RawSpeed/NefDecoder.cpp =================================================================== --- RawSpeed/NefDecoder.cpp 2012-09-30 16:36:58 UTC (rev 460) +++ RawSpeed/NefDecoder.cpp 2012-09-30 16:39:54 UTC (rev 461) @@ -95,7 +95,7 @@ TiffIFD* exif = data[0]; TiffEntry *makernoteEntry = exif->getEntry(MAKERNOTE); const uchar8* makernote = makernoteEntry->getData(); - FileMap makermap((uchar8*)&makernote[10], makernoteEntry->count - 10); + FileMap makermap((uchar8*)&makernote[10], mFile->getSize() - makernoteEntry->getDataOffset() - 10); TiffParser makertiff(&makermap); makertiff.parseData(); _______________________________________________ Rawstudio-commit mailing list [email protected] http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
