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
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
diff --git a/src/common/exif.cc b/src/common/exif.cc
index 484ebf2207..91ea8e64d0 100644
--- a/src/common/exif.cc
+++ b/src/common/exif.cc
@@ -80,6 +80,11 @@ extern "C" {
#define DT_XMP_EXIF_VERSION 5
+#if EXIV2_TEST_VERSION(0,28,0)
+#define AnyError Error
+#define toLong toInt64
+#endif
+
// persistent list of exiv2 tags. set up in dt_init()
static GList *exiv2_taglist = NULL;
@@ -2658,39 +2663,39 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename)
if(g_str_has_prefix(key_iter, "darktable:operation"))
{
current_entry->have_operation = TRUE;
- current_entry->operation = g_strdup(history->value().toString().c_str());
+ current_entry->operation = g_strdup(history->toString().c_str());
}
else if(g_str_has_prefix(key_iter, "darktable:num"))
{
- current_entry->num = history->value().toLong();
+ current_entry->num = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:enabled"))
{
- current_entry->enabled = history->value().toLong() == 1;
+ current_entry->enabled = history->toLong() == 1;
}
else if(g_str_has_prefix(key_iter, "darktable:modversion"))
{
current_entry->have_modversion = TRUE;
- current_entry->modversion = history->value().toLong();
+ current_entry->modversion = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:params"))
{
current_entry->have_params = TRUE;
- current_entry->params = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(),
+ current_entry->params = dt_exif_xmp_decode(history->toString().c_str(), history->size(),
¤t_entry->params_len);
}
else if(g_str_has_prefix(key_iter, "darktable:multi_name"))
{
- current_entry->multi_name = g_strdup(history->value().toString().c_str());
+ current_entry->multi_name = g_strdup(history->toString().c_str());
}
else if(g_str_has_prefix(key_iter, "darktable:multi_priority"))
{
- current_entry->multi_priority = history->value().toLong();
+ current_entry->multi_priority = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:iop_order"))
{
// we ensure reading the iop_order as a high precision float
- string str = g_strdup(history->value().toString().c_str());
+ string str = g_strdup(history->toString().c_str());
static const std::locale& c_locale = std::locale("C");
std::istringstream istring(str);
istring.imbue(c_locale);
@@ -2698,12 +2703,12 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename)
}
else if(g_str_has_prefix(key_iter, "darktable:blendop_version"))
{
- current_entry->blendop_version = history->value().toLong();
+ current_entry->blendop_version = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:blendop_params"))
{
- current_entry->blendop_params = dt_exif_xmp_decode(history->value().toString().c_str(),
- history->value().size(),
+ current_entry->blendop_params = dt_exif_xmp_decode(history->toString().c_str(),
+ history->size(),
¤t_entry->blendop_params_len);
}
}
@@ -2858,35 +2863,35 @@ static GList *read_masks_v3(Exiv2::XmpData &xmpData, const char *filename, const
// go on reading things into current_entry
if(g_str_has_prefix(key_iter, "darktable:mask_num"))
{
- current_entry->mask_num = history->value().toLong();
+ current_entry->mask_num = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:mask_id"))
{
- current_entry->mask_id = history->value().toLong();
+ current_entry->mask_id = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:mask_type"))
{
- current_entry->mask_type = history->value().toLong();
+ current_entry->mask_type = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:mask_name"))
{
- current_entry->mask_name = g_strdup(history->value().toString().c_str());
+ current_entry->mask_name = g_strdup(history->toString().c_str());
}
else if(g_str_has_prefix(key_iter, "darktable:mask_version"))
{
- current_entry->mask_version = history->value().toLong();
+ current_entry->mask_version = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:mask_points"))
{
- current_entry->mask_points = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), ¤t_entry->mask_points_len);
+ current_entry->mask_points = dt_exif_xmp_decode(history->toString().c_str(), history->size(), ¤t_entry->mask_points_len);
}
else if(g_str_has_prefix(key_iter, "darktable:mask_nb"))
{
- current_entry->mask_nb = history->value().toLong();
+ current_entry->mask_nb = history->toLong();
}
else if(g_str_has_prefix(key_iter, "darktable:mask_src"))
{
- current_entry->mask_src = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), ¤t_entry->mask_src_len);
+ current_entry->mask_src = dt_exif_xmp_decode(history->toString().c_str(), history->size(), ¤t_entry->mask_src_len);
}
}
@@ -4060,7 +4065,11 @@ char *dt_exif_xmp_read_string(const int imgid)
std::string xmpPacket;
Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
+#if EXIV2_TEST_VERSION(0,28,0)
+ xmpPacket.assign(buf.c_str(), buf.size());
+#else
xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
+#endif
Exiv2::XmpParser::decode(xmpData, xmpPacket);
// because XmpSeq or XmpBag are added to the list, we first have
// to remove these so that we don't end up with a string of duplicates
@@ -4076,7 +4085,11 @@ char *dt_exif_xmp_read_string(const int imgid)
std::string xmpPacket;
Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
+#if EXIV2_TEST_VERSION(0,28,0)
+ xmpPacket.assign(buf.c_str(), buf.size());
+#else
xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
+#endif
Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
@@ -4204,7 +4217,11 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
std::string xmpPacket;
Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
+#if EXIV2_TEST_VERSION(0,28,0)
+ xmpPacket.assign(buf.c_str(), buf.size());
+#else
xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
+#endif
Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
@@ -4371,7 +4388,7 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
catch(Exiv2::AnyError &e)
{
#if EXIV2_TEST_VERSION(0,27,0)
- if(e.code() == Exiv2::kerTooLargeJpegSegment)
+ if(e.code() == Exiv2::ErrorCode::kerTooLargeJpegSegment)
#else
if(e.code() == 37)
#endif
@@ -4437,7 +4454,11 @@ int dt_exif_xmp_write(const int imgid, const char *filename)
}
Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(filename));
+#if EXIV2_TEST_VERSION(0,28,0)
+ xmpPacket.assign(buf.c_str(), buf.size());
+#else
xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
+#endif
Exiv2::XmpParser::decode(xmpData, xmpPacket);
// because XmpSeq or XmpBag are added to the list, we first have
// to remove these so that we don't end up with a string of duplicates
diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
index f4d4d46e12..41bb021012 100644
--- a/tools/basecurve/exif-wrapper.cpp
+++ b/tools/basecurve/exif-wrapper.cpp
@@ -19,6 +19,7 @@
#include <exiv2/exif.hpp>
#include <exiv2/error.hpp>
#include <exiv2/image.hpp>
+#include <exiv2/version.hpp>
#include <cstdio>
#include <cassert>
@@ -36,13 +37,21 @@ exif_get_ascii_datafield(
try
{
+#if EXIV2_TEST_VERSION(0,28,0)
+ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
+#else
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+#endif
assert(image.get() != 0);
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
+#if EXIV2_TEST_VERSION(0,28,0)
+ Exiv2::Value::UniquePtr val = exifData[key].getValue();
+#else
Exiv2::Value::AutoPtr val = exifData[key].getValue();
+#endif
if (val->typeId() != Exiv2::asciiString)
{
|
