blob: 2bd8b94c3c11ea59f3338e04dfbcadb30f62d2f7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
Patch kindly borrowed from Mageia.
* asturm@gentoo.org: Dropped unnecessary and backwards incompatible
xmp_exiv2.hpp include.
https://gitlab.gnome.org/GNOME/gthumb/issues/30
diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
--- a/extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.000000000 +0200
+++ b/extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232 +0100
@@ -32,7 +32,7 @@
#include <sstream>
#include <vector>
#include <iomanip>
-#include <exiv2/xmp.hpp>
+#include <exiv2/exiv2.hpp>
#include <gthumb.h>
#include "exiv2-utils.h"
@@ -1073,7 +1073,11 @@
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) {
|
