third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore modified tags after TZ manipulation

Browse Source 
This ensures that Xmp date/times that have been set by the user aren't
over written by the TZ restoration efforts. This fixes bug #1998
This commit is contained in:
Jim Easterbrook 2021-11-15 10:18:05 +00:00
parent fde8ed07b3
commit 02ce7e9aff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xmpsidecar.cpp
View File

@ -144,11 +144,6 @@ namespace Exiv2 {
copyExifToXmp(exifData_, xmpData_);
copyIptcToXmp(iptcData_, xmpData_);
// #589 - restore tags which were modified by the convertors
for (auto&& it : copy) {
xmpData_[it.key()] = it.value();
}
// #1112 - restore dates if they lost their TZ info
for (auto&& date : dates_) {
std::string sKey = date.first;
@ -163,6 +158,11 @@ namespace Exiv2 {
}
}
// #589 - restore tags which were modified by the convertors
for (auto&& it : copy) {
xmpData_[it.key()] = it.value();
}
if (XmpParser::encode(xmpPacket_, xmpData_,
XmpParser::omitPacketWrapper|XmpParser::useCompactFormat) > 1) {
#ifndef SUPPRESS_WARNINGS