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

metadata: catch std::exception instead of Exiv2::AnyError for better robustness

Browse Source 
(cherry picked from commit 0e2d9332f633b060bd4d5cbcd9d47009bab0c46c)
This commit is contained in:
Alberto Griggio 2020-01-04 07:13:24 -08:00 committed by Lawrence Lee
parent e7fdad875a
commit e90ffe979b
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/imagedata.cc
View File

@ -499,7 +499,7 @@ FramesData::FramesData(const Glib::ustring &fname) :
#endif #endif
} }
} }
} catch (const Exiv2::AnyError& e) { } catch (const std::exception& e) {
if (settings->verbose) { if (settings->verbose) {
std::cerr << "EXIV2 ERROR: " << e.what() << std::endl; std::cerr << "EXIV2 ERROR: " << e.what() << std::endl;
} }

2
rtengine/imageio.cc
View File

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

6
rtengine/metadata.cc
View File

@ -185,7 +185,7 @@ void Exiv2Metadata::do_merge_xmp(Exiv2::Image *dst) const
for (auto &datum : xmp) { for (auto &datum : xmp) {
dst->xmpData()[datum.key()] = datum; dst->xmpData()[datum.key()] = datum;
} }
} catch (Exiv2::AnyError &exc) { } catch (std::exception &exc) {
if (settings->verbose) { if (settings->verbose) {
std::cerr << "Error loading metadata from XMP sidecar: " std::cerr << "Error loading metadata from XMP sidecar: "
<< exc.what() << std::endl; << exc.what() << std::endl;
@ -240,7 +240,7 @@ void Exiv2Metadata::import_exif_pairs(Exiv2::ExifData &out) const
for (auto &p : *exif_) { for (auto &p : *exif_) {
try { try {
out[p.first] = p.second; out[p.first] = p.second;
} catch (Exiv2::AnyError &exc) {} } catch (std::exception &exc) {}
} }
} }
@ -258,7 +258,7 @@ void Exiv2Metadata::import_iptc_pairs(Exiv2::IptcData &out) const
out.add(d); out.add(d);
} }
} }
} catch (Exiv2::AnyError &exc) {} } catch (std::exception &exc) {}
} }
} }

4
rtgui/exifpanel.cc
View File

@ -233,7 +233,7 @@ void ExifPanel::refreshTags()
for (const auto& p : *changeList) { for (const auto& p : *changeList) {
try { try {
exif[p.first] = p.second; exif[p.first] = p.second;
} catch (const Exiv2::AnyError& exc) { } catch (const std::exception& exc) {
} }
} }
@ -258,7 +258,7 @@ void ExifPanel::refreshTags()
addTag(tag.key(), tag.tagLabel(), tag.print(&exif), false, false); addTag(tag.key(), tag.tagLabel(), tag.print(&exif), false, false);
} }
} }
} catch (const Exiv2::AnyError& exc) { } catch (const std::exception& exc) {
return; return;
} }

2
rtgui/iptcpanel.cc
View File

@ -502,7 +502,7 @@ void IPTCPanel::setImageData (const FramesMetaData* id)
(*embeddedData)[tag.key()].push_back(tag.toString()); (*embeddedData)[tag.key()].push_back(tag.toString());
} }
} }
} catch (const Exiv2::AnyError& exc) { } catch (const std::exception& exc) {
embeddedData->clear(); embeddedData->clear();
} }
} }

2
rtgui/thumbnail.cc
View File

@ -1231,7 +1231,7 @@ void Thumbnail::saveMetadata()
std::cout << "saved edited metadata for " << fname << " to " std::cout << "saved edited metadata for " << fname << " to "
<< fn << std::endl; << fn << std::endl;
} }
} catch (Exiv2::AnyError &exc) { } catch (std::exception &exc) {
std::cerr << "ERROR saving metadata for " << fname << " to " << fn std::cerr << "ERROR saving metadata for " << fname << " to " << fn
<< ": " << exc.what() << std::endl; << ": " << exc.what() << std::endl;
} }