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

metadata: try to be more robust when saving

Browse Source 
Tentative fix for #89

(cherry picked from commit a8b53fef753c7a1146013feeb66be87c688b8631)
This commit is contained in:
Alberto Griggio
2020-05-17 18:28:06 +02:00
committed by Lawrence Lee
parent 700eeccb39
commit 6cec805774
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/imageio.cc
View File

@@ -1399,7 +1399,7 @@ bool ImageIO::saveMetadata(const Glib::ustring &fname) const
// dst->writeMetadata();
} catch (const std::exception& exc) {
std::cout << "EXIF ERROR: " << exc.what() << std::endl;
return false;
//return false;
}
}

28
rtengine/metadata.cc
View File

@@ -238,7 +238,35 @@ void Exiv2Metadata::saveToImage(const Glib::ustring &path) const
dst->exifData()["Exif.Image.Software"] = "RawTherapee " RTVERSION;
import_exif_pairs(dst->exifData());
import_iptc_pairs(dst->iptcData());
bool xmp_tried = false;
bool iptc_tried = false;
for (int i = 0; i < 3; ++i) {
try {
dst->writeMetadata();
return;
} catch (Exiv2::Error &exc) {
if (exc.code() == 37) {
std::string msg = exc.what();
if (msg.find("XMP") != std::string::npos &&
!dst->xmpData().empty()) {
dst->xmpData().clear();
if (!xmp_tried && merge_xmp_) {
do_merge_xmp(dst.get());
xmp_tried = true;
}
} else if (msg.find("IPTC") != std::string::npos &&
!dst->iptcData().empty()) {
dst->iptcData().clear();
if (!iptc_tried) {
import_iptc_pairs(dst->iptcData());
iptc_tried = true;
}
}
} else {
throw exc;
}
}
}
}