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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
From b6bb81a1b46e911d15bbf9a730972523de177705 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Tue, 16 May 2023 10:54:40 +0200
Subject: [PATCH 1/2] change exiv2 AutoPtr to unique_ptr
exiv2-0.28.0 removed Exiv2::Image::AutoPtr and added
Exiv2::Image::UniquePtr instead. since it's a typedef for
std::unique_ptr<Image>, i'm using that directly instead of adding a
condition on the exiv2 version.
---
src/uni-exiv2.cpp | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/uni-exiv2.cpp b/src/uni-exiv2.cpp
index 0d14b9f..77064c2 100644
--- a/src/uni-exiv2.cpp
+++ b/src/uni-exiv2.cpp
@@ -22,12 +22,13 @@
#include <exiv2/exiv2.hpp>
#include <iostream>
+#include <memory>
#include "uni-exiv2.hpp"
#define ARRAY_SIZE(array) (sizeof array/sizeof(array[0]))
-static Exiv2::Image::AutoPtr cached_image;
+static std::unique_ptr<Exiv2::Image> cached_image;
extern "C"
void
@@ -35,8 +36,8 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v
{
Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute);
try {
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri);
- if ( image.get() == 0 ) {
+ std::unique_ptr<Exiv2::Image> image = Exiv2::ImageFactory::open(uri);
+ if (image == nullptr) {
return;
}
@@ -91,14 +92,14 @@ uni_read_exiv2_to_cache(const char *uri)
{
Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute);
- if ( cached_image.get() != NULL ) {
+ if (cached_image != nullptr) {
cached_image->clearMetadata();
- cached_image.reset(NULL);
+ cached_image.reset(nullptr);
}
try {
cached_image = Exiv2::ImageFactory::open(uri);
- if ( cached_image.get() == 0 ) {
+ if (cached_image == nullptr) {
return 1;
}
@@ -116,13 +117,13 @@ uni_write_exiv2_from_cache(const char *uri)
{
Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute);
- if ( cached_image.get() == NULL ) {
+ if (cached_image == nullptr) {
return 1;
}
try {
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri);
- if ( image.get() == 0 ) {
+ std::unique_ptr<Exiv2::Image> image = Exiv2::ImageFactory::open(uri);
+ if (image == nullptr) {
return 2;
}
@@ -130,7 +131,7 @@ uni_write_exiv2_from_cache(const char *uri)
image->writeMetadata();
cached_image->clearMetadata();
- cached_image.reset(NULL);
+ cached_image.reset(nullptr);
return 0;
} catch (Exiv2::AnyError& e) {
From 47d0b98cb46526aa8aa035bebcabc14a11fa57ee Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Tue, 16 May 2023 11:17:00 +0200
Subject: [PATCH 2/2] add support for exiv-0.28.0 errors
exiv2-0.28.0 changed Exiv2::AnyError to Exiv2::Error.
---
src/uni-exiv2.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/uni-exiv2.cpp b/src/uni-exiv2.cpp
index 77064c2..567a50f 100644
--- a/src/uni-exiv2.cpp
+++ b/src/uni-exiv2.cpp
@@ -28,6 +28,15 @@
#define ARRAY_SIZE(array) (sizeof array/sizeof(array[0]))
+#define EXIV_ERROR Exiv2::AnyError
+#ifdef EXIV2_VERSION
+ #ifdef EXIV2_TEST_VERSION
+ #if EXIV2_TEST_VERSION(0,28,0)
+ #define EXIV_ERROR Exiv2::Error
+ #endif
+ #endif
+#endif
+
static std::unique_ptr<Exiv2::Image> cached_image;
extern "C"
@@ -81,7 +90,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v
}
}
}
- } catch (Exiv2::AnyError& e) {
+ } catch (EXIV_ERROR& e) {
std::cerr << "Exiv2: '" << e << "'\n";
}
}
@@ -104,7 +113,7 @@ uni_read_exiv2_to_cache(const char *uri)
}
cached_image->readMetadata();
- } catch (Exiv2::AnyError& e) {
+ } catch (EXIV_ERROR& e) {
std::cerr << "Exiv2: '" << e << "'\n";
}
@@ -134,7 +143,7 @@ uni_write_exiv2_from_cache(const char *uri)
cached_image.reset(nullptr);
return 0;
- } catch (Exiv2::AnyError& e) {
+ } catch (EXIV_ERROR& e) {
std::cerr << "Exiv2: '" << e << "'\n";
}
|
