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
32
33
34
35
36
37
38
39
40
41
|
Patch kindly borrowed from Mageia.
https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
--- a/src/gcm-helper-exiv.cpp 2018-09-04 13:50:05.000000000 +0200
+++ b/src/gcm-helper-exiv.cpp 2018-12-31 15:39:52.288495398 +0100
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <iostream>
#include <iomanip>
@@ -51,7 +50,11 @@
if (argc == 2)
filename = argv[1];
if (filename.empty())
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
+#else
throw Exiv2::Error(1, "No filename specified");
+#endif
image = Exiv2::ImageFactory::open(filename);
image->readMetadata();
@@ -60,7 +63,11 @@
if (exifData.empty()) {
std::string error(argv[1]);
error += ": No Exif data found in the file";
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
+#else
throw Exiv2::Error(1, error);
+#endif
}
/* try to find make, model and serial number */
|
GitWeb
