From b8ba08faa26dcd2d70bc686c0c545a29f88a393c Mon Sep 17 00:00:00 2001 From: Uwe Scholz Date: Sat, 8 Jul 2023 17:15:17 +0200 Subject: [PATCH] Adjust code to work with exiv2 >= 0.28.0 --- src/tags/gnome-cmd-tags-exiv2.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/tags/gnome-cmd-tags-exiv2.cc b/src/tags/gnome-cmd-tags-exiv2.cc index 52aa3d1b..f8d343a6 100644 --- a/src/tags/gnome-cmd-tags-exiv2.cc +++ b/src/tags/gnome-cmd-tags-exiv2.cc @@ -398,7 +398,11 @@ void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *f) #ifdef HAVE_EXIV2 try { +#if EXIV2_TEST_VERSION(0,28,0) + Exiv2::Image::UniquePtr image = ImageFactory::open(fname); +#else Image::AutoPtr image = ImageFactory::open(fname); +#endif image->readMetadata(); @@ -406,7 +410,11 @@ void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *f) readTags(f->metadata, image->iptcData()); } +#if EXIV2_TEST_VERSION(0,28,0) + catch (Error &e) +#else catch (AnyError &e) +#endif { } #endif -- GitLab