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

metadata: erase also jpeg thumbnail

Browse Source 
(cherry picked from commit 88661755506cd48393e69e809cf0559572cb213d)
This commit is contained in:
Alberto Griggio 2019-05-19 14:42:52 -07:00 committed by Lawrence Lee
parent 2d412d7404
commit 77d7e633e5
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rtengine/metadata.cc
View File

@ -187,11 +187,7 @@ void Exiv2Metadata::saveToImage(const Glib::ustring &path) const
dst->readMetadata(); dst->readMetadata();
if (image_.get()) { if (image_.get()) {
dst->setMetadata(*image_); dst->setMetadata(*image_);
auto it = remove_unwanted(dst.get());
dst->exifData().findKey(Exiv2::ExifKey("Exif.Image.Orientation"));
if (it != dst->exifData().end()) {
dst->exifData().erase(it);
}
if (merge_xmp_) { if (merge_xmp_) {
do_merge_xmp(dst.get()); do_merge_xmp(dst.get());
} }
@ -208,6 +204,23 @@ void Exiv2Metadata::saveToImage(const Glib::ustring &path) const
} }
void Exiv2Metadata::remove_unwanted(Exiv2::Image *dst) const
{
static const std::vector<std::string> keys = {
"Exif.Image.Orientation",
"Exif.Photo.MakerNote"
};
for (auto &k : keys) {
auto it = dst->exifData().findKey(Exiv2::ExifKey(k));
if (it != dst->exifData().end()) {
dst->exifData().erase(it);
}
}
Exiv2::ExifThumb thumb(dst->exifData());
thumb.erase();
}
void Exiv2Metadata::import_exif_pairs(Exiv2::ExifData &out) const void Exiv2Metadata::import_exif_pairs(Exiv2::ExifData &out) const
{ {
for (auto &p : *exif_) { for (auto &p : *exif_) {

1
rtengine/metadata.h
View File

@ -64,6 +64,7 @@ private:
void do_merge_xmp(Exiv2::Image* dst) const; void do_merge_xmp(Exiv2::Image* dst) const;
void import_exif_pairs(Exiv2::ExifData& out) const; void import_exif_pairs(Exiv2::ExifData& out) const;
void import_iptc_pairs(Exiv2::IptcData& out) const; void import_iptc_pairs(Exiv2::IptcData& out) const;
void remove_unwanted(Exiv2::Image* dst) const;
Glib::ustring src_; Glib::ustring src_;
bool merge_xmp_; bool merge_xmp_;