From 939315f67b83441ba214678fc60f491f22beda22 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Tue, 26 Jan 2021 08:15:36 +0100 Subject: [PATCH] metadata: do not exclude tags that were explicitly selected by the user (cherry picked from commit 60d862fa72046ecf8f44c2a1677f72237e86e838) --- rtengine/metadata.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rtengine/metadata.cc b/rtengine/metadata.cc index 236d402da..c0bdcfa29 100644 --- a/rtengine/metadata.cc +++ b/rtengine/metadata.cc @@ -363,9 +363,10 @@ void Exiv2Metadata::remove_unwanted(Exiv2::ExifData &dst) const } for (auto it = dst.begin(); it != dst.end(); ) { - if (badtags.find(it->key()) != badtags.end()) { + int relevant = exif_keys_ ? (exif_keys_->find(it->key()) != exif_keys_->end() ? 1 : 0) : -1; + if (badtags.find(it->key()) != badtags.end() && relevant != 1) { it = dst.erase(it); - } else if (exif_keys_ && exif_keys_->find(it->key()) == exif_keys_->end()) { + } else if (relevant == 0) { it = dst.erase(it); } else { bool found = false;