[gthumb/wip/kalev/exiv2-0.27] Fix the build with exiv2 0.27
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb/wip/kalev/exiv2-0.27] Fix the build with exiv2 0.27
- Date: Tue, 19 Feb 2019 15:47:29 +0000 (UTC)
commit 5165dc7e188c6c75e055008c3e4d9131467de41a
Author: Kalev Lember <klember redhat com>
Date: Thu Jan 31 15:01:02 2019 +0100
Fix the build with exiv2 0.27
Fixes: https://gitlab.gnome.org/GNOME/gthumb/issues/30
extensions/exiv2_tools/exiv2-utils.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
index 4513771c..6da8d593 100644
--- a/extensions/exiv2_tools/exiv2-utils.cpp
+++ b/extensions/exiv2_tools/exiv2-utils.cpp
@@ -32,7 +32,8 @@
#include <sstream>
#include <vector>
#include <iomanip>
-#include <exiv2/xmp.hpp>
+#include <exiv2/exiv2.hpp>
+#include <exiv2/xmp_exiv2.hpp>
#include <gthumb.h>
#include "exiv2-utils.h"
@@ -1071,7 +1072,11 @@ dump_exif_data (Exiv2::ExifData &exifData,
try {
if (exifData.empty()) {
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
+#else
throw Exiv2::Error(1, " No Exif data found in the file");
+#endif
}
Exiv2::ExifData::const_iterator end = exifData.end();
for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]