From e032586d74c8e241947b8ada0c592fa8b50956ab Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Thu, 26 Nov 2020 20:29:38 +0000 Subject: [PATCH] Code/comment tidy. --- src/tiffvisitor_int.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/tiffvisitor_int.cpp b/src/tiffvisitor_int.cpp index 218d970d..7c7550d9 100644 --- a/src/tiffvisitor_int.cpp +++ b/src/tiffvisitor_int.cpp @@ -293,15 +293,13 @@ namespace Exiv2 { { assert(pRoot != 0); - // For FujiFilm, don't clear the metadata. Search for the make - //exifData_.clear(); - //iptcData_.clear(); - //xmpData_.clear(); - // Find camera make + // #1402 Fujifilm RAF. Search for the make + // Find camera make in existing metadata (read from the JPEG) ExifKey key("Exif.Image.Make"); if ( exifData_.findKey(key) != exifData_.end( ) ){ make_ = exifData_.findKey(key)->toString(); } else { + // Find camera make by looking for tag 0x010f in IFD0 TiffFinder finder(0x010f, ifd0Id); pRoot_->accept(finder); TiffEntryBase* te = dynamic_cast(finder.result());