Mercurial > geeqie.yaz
annotate src/exiv2.cc @ 1464:1b3751ac4743
be more verbose on parse errors
author | nadvornik |
---|---|
date | Fri, 20 Mar 2009 10:12:29 +0000 |
parents | 8178ef34d257 |
children | 6fdb447d87b7 |
rev | line source |
---|---|
475 | 1 /* |
2 * Geeqie | |
1284 | 3 * Copyright (C) 2008 - 2009 The Geeqie Team |
475 | 4 * |
5 * Author: Vladimir Nadvornik | |
6 * | |
7 * This software is released under the GNU General Public License (GNU GPL). | |
8 * Please read the included file COPYING for more information. | |
9 * This software comes with no warranty of any kind, use at your own risk! | |
10 */ | |
178 | 11 |
686 | 12 #include "config.h" |
178 | 13 |
14 #ifdef HAVE_EXIV2 | |
15 | |
16 #include <exiv2/image.hpp> | |
17 #include <exiv2/exif.hpp> | |
18 #include <iostream> | |
19 | |
200 | 20 // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. |
21 #ifndef EXIV2_TEST_VERSION | |
22 # define EXIV2_TEST_VERSION(major,minor,patch) \ | |
23 ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) | |
24 #endif | |
25 | |
26 | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
27 #include <sys/types.h> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
28 #include <sys/stat.h> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
29 #include <unistd.h> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
30 #include <fcntl.h> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
31 #include <sys/mman.h> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
32 |
1008 | 33 #if !EXIV2_TEST_VERSION(0,17,90) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
34 #include <exiv2/tiffparser.hpp> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
35 #include <exiv2/tiffcomposite.hpp> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
36 #include <exiv2/tiffvisitor.hpp> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
37 #include <exiv2/tiffimage.hpp> |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
38 #include <exiv2/cr2image.hpp> |
191 | 39 #include <exiv2/crwimage.hpp> |
200 | 40 #if EXIV2_TEST_VERSION(0,16,0) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
41 #include <exiv2/orfimage.hpp> |
200 | 42 #endif |
43 #if EXIV2_TEST_VERSION(0,13,0) | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
44 #include <exiv2/rafimage.hpp> |
200 | 45 #endif |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
46 #include <exiv2/futils.hpp> |
1008 | 47 #else |
48 #include <exiv2/preview.hpp> | |
49 #endif | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
50 |
1070 | 51 #if EXIV2_TEST_VERSION(0,17,0) |
52 #include <exiv2/convert.hpp> | |
1071 | 53 #include <exiv2/xmpsidecar.hpp> |
1070 | 54 #endif |
55 | |
178 | 56 extern "C" { |
995 | 57 #include <glib.h> |
507 | 58 |
281 | 59 #include "main.h" |
178 | 60 #include "exif.h" |
507 | 61 |
586 | 62 #include "filefilter.h" |
496
a1f13fab6686
fixed a bug in opening files with non-utf8 locales in exiv2.cc
nadvornik
parents:
495
diff
changeset
|
63 #include "ui_fileops.h" |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
64 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
65 #include "misc.h" |
184 | 66 } |
178 | 67 |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
68 typedef struct _AltKey AltKey; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
69 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
70 struct _AltKey |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
71 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
72 const gchar *xmp_key; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
73 const gchar *exif_key; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
74 const gchar *iptc_key; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
75 }; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
76 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
77 /* this is a list of keys that should be converted, even with the older Exiv2 which does not support it directly */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
78 static const AltKey alt_keys[] = { |
1460 | 79 {"Xmp.tiff.Orientation", "Exif.Image.Orientation", NULL}, |
80 {"Xmp.dc.title", NULL, "Iptc.Application2.ObjectName" }, | |
81 {"Xmp.photoshop.Urgency", NULL, "Iptc.Application2.Urgency" }, | |
82 {"Xmp.photoshop.Category", NULL, "Iptc.Application2.Category" }, | |
83 {"Xmp.photoshop.SupplementalCategory", NULL, "Iptc.Application2.SuppCategory" }, | |
84 {"Xmp.dc.subject", NULL, "Iptc.Application2.Keywords" }, | |
85 {"Xmp.iptc.Location", NULL, "Iptc.Application2.LocationName" }, | |
86 {"Xmp.photoshop.Instruction", NULL, "Iptc.Application2.SpecialInstructions" }, | |
87 {"Xmp.photoshop.DateCreated", NULL, "Iptc.Application2.DateCreated" }, | |
88 {"Xmp.dc.creator", NULL, "Iptc.Application2.Byline" }, | |
89 {"Xmp.photoshop.AuthorsPosition", NULL, "Iptc.Application2.BylineTitle" }, | |
90 {"Xmp.photoshop.City", NULL, "Iptc.Application2.City" }, | |
91 {"Xmp.photoshop.State", NULL, "Iptc.Application2.ProvinceState" }, | |
92 {"Xmp.iptc.CountryCode", NULL, "Iptc.Application2.CountryCode" }, | |
93 {"Xmp.photoshop.Country", NULL, "Iptc.Application2.CountryName" }, | |
94 {"Xmp.photoshop.TransmissionReference", NULL, "Iptc.Application2.TransmissionReference"}, | |
95 {"Xmp.photoshop.Headline", NULL, "Iptc.Application2.Headline" }, | |
96 {"Xmp.photoshop.Credit", NULL, "Iptc.Application2.Credit" }, | |
97 {"Xmp.photoshop.Source", NULL, "Iptc.Application2.Source" }, | |
98 {"Xmp.dc.rights", NULL, "Iptc.Application2.Copyright" }, | |
99 {"Xmp.dc.description", NULL, "Iptc.Application2.Caption" }, | |
100 {"Xmp.photoshop.CaptionWriter", NULL, "Iptc.Application2.Writer" }, | |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
101 {NULL, NULL, NULL} |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
102 }; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
103 |
178 | 104 struct _ExifData |
105 { | |
185 | 106 Exiv2::ExifData::const_iterator exifIter; /* for exif_get_next_item */ |
107 Exiv2::IptcData::const_iterator iptcIter; /* for exif_get_next_item */ | |
200 | 108 #if EXIV2_TEST_VERSION(0,16,0) |
185 | 109 Exiv2::XmpData::const_iterator xmpIter; /* for exif_get_next_item */ |
200 | 110 #endif |
184 | 111 |
1069 | 112 virtual ~_ExifData() |
113 { | |
114 } | |
115 | |
1211 | 116 virtual void writeMetadata(gchar *path = NULL) |
184 | 117 { |
1069 | 118 g_critical("Unsupported method of writing metadata"); |
119 } | |
120 | |
121 virtual ExifData *original() | |
122 { | |
123 return NULL; | |
124 } | |
125 | |
126 virtual Exiv2::Image *image() = 0; | |
127 | |
128 virtual Exiv2::ExifData &exifData() = 0; | |
129 | |
130 virtual Exiv2::IptcData &iptcData() = 0; | |
200 | 131 |
132 #if EXIV2_TEST_VERSION(0,16,0) | |
1069 | 133 virtual Exiv2::XmpData &xmpData() = 0; |
134 #endif | |
135 | |
136 virtual void add_jpeg_color_profile(unsigned char *cp_data, guint cp_length) = 0; | |
137 | |
138 virtual guchar *get_jpeg_color_profile(guint *data_len) = 0; | |
139 }; | |
140 | |
141 // This allows read-only access to the original metadata | |
142 struct _ExifDataOriginal : public _ExifData | |
143 { | |
144 protected: | |
145 Exiv2::Image::AutoPtr image_; | |
146 | |
147 /* the icc profile in jpeg is not technically exif - store it here */ | |
148 unsigned char *cp_data_; | |
149 guint cp_length_; | |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
150 gboolean valid_; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
151 |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
152 Exiv2::ExifData emptyExifData_; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
153 Exiv2::IptcData emptyIptcData_; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
154 #if EXIV2_TEST_VERSION(0,16,0) |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
155 Exiv2::XmpData emptyXmpData_; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
156 #endif |
1069 | 157 |
158 public: | |
1071 | 159 _ExifDataOriginal(Exiv2::Image::AutoPtr image) |
160 { | |
161 cp_data_ = NULL; | |
162 cp_length_ = 0; | |
163 image_ = image; | |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
164 valid_ = TRUE; |
1071 | 165 } |
1069 | 166 |
167 _ExifDataOriginal(gchar *path) | |
168 { | |
169 cp_data_ = NULL; | |
170 cp_length_ = 0; | |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
171 valid_ = TRUE; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
172 |
1069 | 173 gchar *pathl = path_from_utf8(path); |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
174 try |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
175 { |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
176 image_ = Exiv2::ImageFactory::open(pathl); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
177 // g_assert (image.get() != 0); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
178 image_->readMetadata(); |
1069 | 179 |
180 #if EXIV2_TEST_VERSION(0,16,0) | |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
181 if (image_->mimeType() == "application/rdf+xml") |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
182 { |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
183 //Exiv2 sidecar converts xmp to exif and iptc, we don't want it. |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
184 image_->clearExifData(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
185 image_->clearIptcData(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
186 } |
1069 | 187 #endif |
449 | 188 |
452
0a69a779395a
fixed color profile code for older versions of exiv2
nadvornik
parents:
449
diff
changeset
|
189 #if EXIV2_TEST_VERSION(0,14,0) |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
190 if (image_->mimeType() == "image/jpeg") |
1196 | 191 { |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
192 /* try to get jpeg color profile */ |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
193 Exiv2::BasicIo &io = image_->io(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
194 gint open = io.isopen(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
195 if (!open) io.open(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
196 if (io.isopen()) |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
197 { |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
198 unsigned char *mapped = (unsigned char*)io.mmap(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
199 if (mapped) exif_jpeg_parse_color(this, mapped, io.size()); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
200 io.munmap(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
201 } |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
202 if (!open) io.close(); |
1196 | 203 } |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
204 #endif |
449 | 205 } |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
206 catch (Exiv2::AnyError& e) |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
207 { |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
208 valid_ = FALSE; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
209 } |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
210 g_free(pathl); |
184 | 211 } |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
212 |
1069 | 213 virtual ~_ExifDataOriginal() |
449 | 214 { |
1069 | 215 if (cp_data_) g_free(cp_data_); |
449 | 216 } |
217 | |
1069 | 218 virtual Exiv2::Image *image() |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
219 { |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
220 if (!valid_) return NULL; |
1069 | 221 return image_.get(); |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
222 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
223 |
1069 | 224 virtual Exiv2::ExifData &exifData () |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
225 { |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
226 if (!valid_) return emptyExifData_; |
1069 | 227 return image_->exifData(); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
228 } |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
229 |
1069 | 230 virtual Exiv2::IptcData &iptcData () |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
231 { |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
232 if (!valid_) return emptyIptcData_; |
1069 | 233 return image_->iptcData(); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
234 } |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
235 |
200 | 236 #if EXIV2_TEST_VERSION(0,16,0) |
1069 | 237 virtual Exiv2::XmpData &xmpData () |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
238 { |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
239 if (!valid_) return emptyXmpData_; |
1069 | 240 return image_->xmpData(); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
241 } |
200 | 242 #endif |
184 | 243 |
1069 | 244 virtual void add_jpeg_color_profile(unsigned char *cp_data, guint cp_length) |
245 { | |
246 if (cp_data_) g_free(cp_data_); | |
247 cp_data_ = cp_data; | |
248 cp_length_ = cp_length; | |
249 } | |
250 | |
251 virtual guchar *get_jpeg_color_profile(guint *data_len) | |
252 { | |
253 if (cp_data_) | |
254 { | |
255 if (data_len) *data_len = cp_length_; | |
256 return (unsigned char *) g_memdup(cp_data_, cp_length_); | |
257 } | |
258 return NULL; | |
259 } | |
178 | 260 }; |
261 | |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
262 extern "C" { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
263 static void _ExifDataProcessed_update_xmp(gpointer key, gpointer value, gpointer data); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
264 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
265 |
1069 | 266 // This allows read-write access to the metadata |
267 struct _ExifDataProcessed : public _ExifData | |
268 { | |
269 protected: | |
270 _ExifDataOriginal *imageData_; | |
271 _ExifDataOriginal *sidecarData_; | |
272 | |
273 Exiv2::ExifData exifData_; | |
274 Exiv2::IptcData iptcData_; | |
275 #if EXIV2_TEST_VERSION(0,16,0) | |
276 Exiv2::XmpData xmpData_; | |
277 #endif | |
278 | |
279 public: | |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
280 _ExifDataProcessed(gchar *path, gchar *sidecar_path, GHashTable *modified_xmp) |
1069 | 281 { |
282 imageData_ = new _ExifDataOriginal(path); | |
283 sidecarData_ = NULL; | |
284 #if EXIV2_TEST_VERSION(0,16,0) | |
1224 | 285 if (sidecar_path) |
1069 | 286 { |
287 sidecarData_ = new _ExifDataOriginal(sidecar_path); | |
288 xmpData_ = sidecarData_->xmpData(); | |
289 } | |
1224 | 290 else |
291 { | |
292 xmpData_ = imageData_->xmpData(); | |
293 } | |
294 | |
1069 | 295 #endif |
296 exifData_ = imageData_->exifData(); | |
297 iptcData_ = imageData_->iptcData(); | |
1070 | 298 #if EXIV2_TEST_VERSION(0,17,0) |
299 syncExifWithXmp(exifData_, xmpData_); | |
300 #endif | |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
301 if (modified_xmp) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
302 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
303 g_hash_table_foreach(modified_xmp, _ExifDataProcessed_update_xmp, this); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
304 } |
1069 | 305 } |
306 | |
307 virtual ~_ExifDataProcessed() | |
308 { | |
309 if (imageData_) delete imageData_; | |
310 if (sidecarData_) delete sidecarData_; | |
311 } | |
312 | |
313 virtual ExifData *original() | |
314 { | |
315 return imageData_; | |
316 } | |
317 | |
1211 | 318 virtual void writeMetadata(gchar *path = NULL) |
1069 | 319 { |
1211 | 320 if (!path) |
1069 | 321 { |
1211 | 322 #if EXIV2_TEST_VERSION(0,17,0) |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
323 if (options->metadata.save_legacy_IPTC) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
324 copyXmpToIptc(xmpData_, iptcData_); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
325 else |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
326 iptcData_.clear(); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
327 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
328 copyXmpToExif(xmpData_, exifData_); |
1211 | 329 #endif |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
330 Exiv2::Image *image = imageData_->image(); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
331 |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
332 if (!image) Exiv2::Error(21); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
333 image->setExifData(exifData_); |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
334 image->setIptcData(iptcData_); |
1245 | 335 #if EXIV2_TEST_VERSION(0,16,0) |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
336 image->setXmpData(xmpData_); |
1245 | 337 #endif |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
338 image->writeMetadata(); |
1211 | 339 } |
1069 | 340 else |
341 { | |
1071 | 342 #if EXIV2_TEST_VERSION(0,17,0) |
1211 | 343 gchar *pathl = path_from_utf8(path);; |
1071 | 344 |
1211 | 345 Exiv2::Image::AutoPtr sidecar = Exiv2::ImageFactory::create(Exiv2::ImageType::xmp, pathl); |
1071 | 346 |
1211 | 347 g_free(pathl); |
348 | |
349 sidecar->setXmpData(xmpData_); | |
350 sidecar->writeMetadata(); | |
351 #else | |
352 throw Exiv2::Error(3, "xmp"); | |
1071 | 353 #endif |
1069 | 354 } |
355 } | |
356 | |
357 virtual Exiv2::Image *image() | |
358 { | |
359 return imageData_->image(); | |
360 } | |
361 | |
362 virtual Exiv2::ExifData &exifData () | |
363 { | |
364 return exifData_; | |
365 } | |
366 | |
367 virtual Exiv2::IptcData &iptcData () | |
368 { | |
369 return iptcData_; | |
370 } | |
371 | |
372 #if EXIV2_TEST_VERSION(0,16,0) | |
373 virtual Exiv2::XmpData &xmpData () | |
374 { | |
375 return xmpData_; | |
376 } | |
377 #endif | |
378 | |
379 virtual void add_jpeg_color_profile(unsigned char *cp_data, guint cp_length) | |
380 { | |
381 imageData_->add_jpeg_color_profile(cp_data, cp_length); | |
382 } | |
383 | |
384 virtual guchar *get_jpeg_color_profile(guint *data_len) | |
385 { | |
386 return imageData_->get_jpeg_color_profile(data_len); | |
387 } | |
388 }; | |
389 | |
390 | |
391 | |
392 | |
184 | 393 extern "C" { |
178 | 394 |
1288 | 395 |
396 void exif_init(void) | |
397 { | |
398 #ifdef EXV_ENABLE_NLS | |
399 bind_textdomain_codeset (EXV_PACKAGE, "UTF-8"); | |
400 #endif | |
401 } | |
402 | |
403 | |
404 | |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
405 static void _ExifDataProcessed_update_xmp(gpointer key, gpointer value, gpointer data) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
406 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
407 exif_update_metadata((ExifData *)data, (gchar *)key, (GList *)value); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
408 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
409 |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
410 ExifData *exif_read(gchar *path, gchar *sidecar_path, GHashTable *modified_xmp) |
178 | 411 { |
506
fc9c8a3e1a8b
Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents:
496
diff
changeset
|
412 DEBUG_1("exif read %s, sidecar: %s", path, sidecar_path ? sidecar_path : "-"); |
178 | 413 try { |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
414 return new _ExifDataProcessed(path, sidecar_path, modified_xmp); |
178 | 415 } |
416 catch (Exiv2::AnyError& e) { | |
417 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
418 return NULL; |
178 | 419 } |
179
37004d5a584a
and first version that actually shows some exif data (see advanced view)
nadvornik
parents:
178
diff
changeset
|
420 |
178 | 421 } |
422 | |
1211 | 423 gboolean exif_write(ExifData *exif) |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
424 { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
425 try { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
426 exif->writeMetadata(); |
1211 | 427 return TRUE; |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
428 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
429 catch (Exiv2::AnyError& e) { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
430 std::cout << "Caught Exiv2 exception '" << e << "'\n"; |
1211 | 431 return FALSE; |
432 } | |
433 } | |
434 | |
435 gboolean exif_write_sidecar(ExifData *exif, gchar *path) | |
436 { | |
437 try { | |
438 exif->writeMetadata(path); | |
439 return TRUE; | |
440 } | |
441 catch (Exiv2::AnyError& e) { | |
442 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
443 return FALSE; | |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
444 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
445 |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
446 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
447 |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
448 |
178 | 449 void exif_free(ExifData *exif) |
450 { | |
1072 | 451 if (!exif) return; |
1069 | 452 g_assert(dynamic_cast<_ExifDataProcessed *>(exif)); // this should not be called on ExifDataOriginal |
182 | 453 delete exif; |
178 | 454 } |
455 | |
1069 | 456 ExifData *exif_get_original(ExifData *exif) |
457 { | |
458 return exif->original(); | |
459 } | |
460 | |
461 | |
184 | 462 ExifItem *exif_get_item(ExifData *exif, const gchar *key) |
178 | 463 { |
183 | 464 try { |
452
0a69a779395a
fixed color profile code for older versions of exiv2
nadvornik
parents:
449
diff
changeset
|
465 Exiv2::Metadatum *item = NULL; |
185 | 466 try { |
467 Exiv2::ExifKey ekey(key); | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
468 Exiv2::ExifData::iterator pos = exif->exifData().findKey(ekey); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
469 if (pos == exif->exifData().end()) return NULL; |
185 | 470 item = &*pos; |
471 } | |
472 catch (Exiv2::AnyError& e) { | |
473 try { | |
474 Exiv2::IptcKey ekey(key); | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
475 Exiv2::IptcData::iterator pos = exif->iptcData().findKey(ekey); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
476 if (pos == exif->iptcData().end()) return NULL; |
185 | 477 item = &*pos; |
478 } | |
479 catch (Exiv2::AnyError& e) { | |
200 | 480 #if EXIV2_TEST_VERSION(0,16,0) |
185 | 481 Exiv2::XmpKey ekey(key); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
482 Exiv2::XmpData::iterator pos = exif->xmpData().findKey(ekey); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
483 if (pos == exif->xmpData().end()) return NULL; |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
484 item = &*pos; |
200 | 485 #endif |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
486 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
487 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
488 return (ExifItem *)item; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
489 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
490 catch (Exiv2::AnyError& e) { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
491 std::cout << "Caught Exiv2 exception '" << e << "'\n"; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
492 return NULL; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
493 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
494 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
495 |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
496 ExifItem *exif_add_item(ExifData *exif, const gchar *key) |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
497 { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
498 try { |
452
0a69a779395a
fixed color profile code for older versions of exiv2
nadvornik
parents:
449
diff
changeset
|
499 Exiv2::Metadatum *item = NULL; |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
500 try { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
501 Exiv2::ExifKey ekey(key); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
502 exif->exifData().add(ekey, NULL); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
503 Exiv2::ExifData::iterator pos = exif->exifData().end(); // a hack, there should be a better way to get the currently added item |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
504 pos--; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
505 item = &*pos; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
506 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
507 catch (Exiv2::AnyError& e) { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
508 try { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
509 Exiv2::IptcKey ekey(key); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
510 exif->iptcData().add(ekey, NULL); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
511 Exiv2::IptcData::iterator pos = exif->iptcData().end(); |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
512 pos--; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
513 item = &*pos; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
514 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
515 catch (Exiv2::AnyError& e) { |
200 | 516 #if EXIV2_TEST_VERSION(0,16,0) |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
517 Exiv2::XmpKey ekey(key); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
518 exif->xmpData().add(ekey, NULL); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
519 Exiv2::XmpData::iterator pos = exif->xmpData().end(); |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
520 pos--; |
185 | 521 item = &*pos; |
200 | 522 #endif |
185 | 523 } |
524 } | |
184 | 525 return (ExifItem *)item; |
183 | 526 } |
527 catch (Exiv2::AnyError& e) { | |
184 | 528 std::cout << "Caught Exiv2 exception '" << e << "'\n"; |
529 return NULL; | |
530 } | |
531 } | |
532 | |
533 | |
534 ExifItem *exif_get_first_item(ExifData *exif) | |
535 { | |
536 try { | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
537 exif->exifIter = exif->exifData().begin(); |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
538 exif->iptcIter = exif->iptcData().begin(); |
200 | 539 #if EXIV2_TEST_VERSION(0,16,0) |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
540 exif->xmpIter = exif->xmpData().begin(); |
200 | 541 #endif |
995 | 542 if (exif->exifIter != exif->exifData().end()) |
185 | 543 { |
544 const Exiv2::Metadatum *item = &*exif->exifIter; | |
545 exif->exifIter++; | |
546 return (ExifItem *)item; | |
547 } | |
995 | 548 if (exif->iptcIter != exif->iptcData().end()) |
185 | 549 { |
550 const Exiv2::Metadatum *item = &*exif->iptcIter; | |
551 exif->iptcIter++; | |
552 return (ExifItem *)item; | |
553 } | |
200 | 554 #if EXIV2_TEST_VERSION(0,16,0) |
995 | 555 if (exif->xmpIter != exif->xmpData().end()) |
185 | 556 { |
557 const Exiv2::Metadatum *item = &*exif->xmpIter; | |
558 exif->xmpIter++; | |
559 return (ExifItem *)item; | |
560 } | |
200 | 561 #endif |
185 | 562 return NULL; |
563 | |
184 | 564 } |
565 catch (Exiv2::AnyError& e) { | |
566 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
183 | 567 return NULL; |
568 } | |
178 | 569 } |
570 | |
571 ExifItem *exif_get_next_item(ExifData *exif) | |
572 { | |
184 | 573 try { |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
574 if (exif->exifIter != exif->exifData().end()) |
185 | 575 { |
576 const Exiv2::Metadatum *item = &*exif->exifIter; | |
577 exif->exifIter++; | |
578 return (ExifItem *)item; | |
579 } | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
580 if (exif->iptcIter != exif->iptcData().end()) |
185 | 581 { |
582 const Exiv2::Metadatum *item = &*exif->iptcIter; | |
583 exif->iptcIter++; | |
584 return (ExifItem *)item; | |
585 } | |
200 | 586 #if EXIV2_TEST_VERSION(0,16,0) |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
587 if (exif->xmpIter != exif->xmpData().end()) |
185 | 588 { |
589 const Exiv2::Metadatum *item = &*exif->xmpIter; | |
590 exif->xmpIter++; | |
591 return (ExifItem *)item; | |
592 } | |
200 | 593 #endif |
185 | 594 return NULL; |
184 | 595 } |
596 catch (Exiv2::AnyError& e) { | |
597 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
598 return NULL; | |
599 } | |
178 | 600 } |
601 | |
185 | 602 char *exif_item_get_tag_name(ExifItem *item) |
178 | 603 { |
184 | 604 try { |
605 if (!item) return NULL; | |
185 | 606 return g_strdup(((Exiv2::Metadatum *)item)->key().c_str()); |
184 | 607 } |
608 catch (Exiv2::AnyError& e) { | |
609 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
610 return NULL; | |
611 } | |
178 | 612 } |
613 | |
614 guint exif_item_get_tag_id(ExifItem *item) | |
615 { | |
184 | 616 try { |
617 if (!item) return 0; | |
185 | 618 return ((Exiv2::Metadatum *)item)->tag(); |
184 | 619 } |
620 catch (Exiv2::AnyError& e) { | |
621 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
622 return 0; | |
623 } | |
178 | 624 } |
625 | |
626 guint exif_item_get_elements(ExifItem *item) | |
627 { | |
184 | 628 try { |
629 if (!item) return 0; | |
185 | 630 return ((Exiv2::Metadatum *)item)->count(); |
184 | 631 } |
632 catch (Exiv2::AnyError& e) { | |
633 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
185 | 634 return 0; |
184 | 635 } |
178 | 636 } |
637 | |
638 char *exif_item_get_data(ExifItem *item, guint *data_len) | |
639 { | |
414
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
640 try { |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
641 if (!item) return 0; |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
642 Exiv2::Metadatum *md = (Exiv2::Metadatum *)item; |
855 | 643 if (data_len) *data_len = md->size(); |
414
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
644 char *data = (char *)g_malloc(md->size()); |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
645 long res = md->copy((Exiv2::byte *)data, Exiv2::littleEndian /* should not matter */); |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
646 g_assert(res == md->size()); |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
647 return data; |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
648 } |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
649 catch (Exiv2::AnyError& e) { |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
650 std::cout << "Caught Exiv2 exception '" << e << "'\n"; |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
651 return NULL; |
49c1cbe058ae
partially fixed reading embedded color profiles with exiv2
nadvornik
parents:
304
diff
changeset
|
652 } |
178 | 653 } |
654 | |
182 | 655 char *exif_item_get_description(ExifItem *item) |
178 | 656 { |
184 | 657 try { |
658 if (!item) return NULL; | |
1288 | 659 return utf8_validate_or_convert(((Exiv2::Metadatum *)item)->tagLabel().c_str()); |
184 | 660 } |
185 | 661 catch (std::exception& e) { |
662 // std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
184 | 663 return NULL; |
664 } | |
178 | 665 } |
666 | |
667 /* | |
668 invalidTypeId, unsignedByte, asciiString, unsignedShort, | |
669 unsignedLong, unsignedRational, signedByte, undefined, | |
670 signedShort, signedLong, signedRational, string, | |
671 date, time, comment, directory, | |
672 xmpText, xmpAlt, xmpBag, xmpSeq, | |
995 | 673 langAlt, lastTypeId |
178 | 674 */ |
675 | |
184 | 676 static guint format_id_trans_tbl [] = { |
677 EXIF_FORMAT_UNKNOWN, | |
678 EXIF_FORMAT_BYTE_UNSIGNED, | |
679 EXIF_FORMAT_STRING, | |
680 EXIF_FORMAT_SHORT_UNSIGNED, | |
681 EXIF_FORMAT_LONG_UNSIGNED, | |
682 EXIF_FORMAT_RATIONAL_UNSIGNED, | |
683 EXIF_FORMAT_BYTE, | |
684 EXIF_FORMAT_UNDEFINED, | |
685 EXIF_FORMAT_SHORT, | |
686 EXIF_FORMAT_LONG, | |
687 EXIF_FORMAT_RATIONAL, | |
688 EXIF_FORMAT_STRING, | |
689 EXIF_FORMAT_STRING, | |
690 EXIF_FORMAT_STRING, | |
691 EXIF_FORMAT_UNDEFINED, | |
692 EXIF_FORMAT_STRING, | |
693 EXIF_FORMAT_STRING, | |
694 EXIF_FORMAT_STRING, | |
695 EXIF_FORMAT_STRING | |
696 }; | |
697 | |
698 | |
178 | 699 |
700 guint exif_item_get_format_id(ExifItem *item) | |
701 { | |
184 | 702 try { |
703 if (!item) return EXIF_FORMAT_UNKNOWN; | |
185 | 704 guint id = ((Exiv2::Metadatum *)item)->typeId(); |
184 | 705 if (id >= (sizeof(format_id_trans_tbl) / sizeof(format_id_trans_tbl[0])) ) return EXIF_FORMAT_UNKNOWN; |
706 return format_id_trans_tbl[id]; | |
707 } | |
708 catch (Exiv2::AnyError& e) { | |
709 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
710 return EXIF_FORMAT_UNKNOWN; | |
711 } | |
178 | 712 } |
184 | 713 |
1422 | 714 const char *exif_item_get_format_name(ExifItem *item, gboolean brief) |
178 | 715 { |
184 | 716 try { |
717 if (!item) return NULL; | |
185 | 718 return ((Exiv2::Metadatum *)item)->typeName(); |
184 | 719 } |
720 catch (Exiv2::AnyError& e) { | |
721 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
722 return NULL; | |
723 } | |
178 | 724 } |
725 | |
726 | |
727 gchar *exif_item_get_data_as_text(ExifItem *item) | |
728 { | |
183 | 729 try { |
184 | 730 if (!item) return NULL; |
676 | 731 Exiv2::Metadatum *metadatum = (Exiv2::Metadatum *)item; |
677 | 732 #if EXIV2_TEST_VERSION(0,17,0) |
1288 | 733 return utf8_validate_or_convert(metadatum->print().c_str()); |
676 | 734 #else |
735 std::stringstream str; | |
736 Exiv2::Exifdatum *exifdatum; | |
737 Exiv2::Iptcdatum *iptcdatum; | |
686 | 738 #if EXIV2_TEST_VERSION(0,16,0) |
676 | 739 Exiv2::Xmpdatum *xmpdatum; |
686 | 740 #endif |
855 | 741 if ((exifdatum = dynamic_cast<Exiv2::Exifdatum *>(metadatum))) |
676 | 742 str << *exifdatum; |
743 else if ((iptcdatum = dynamic_cast<Exiv2::Iptcdatum *>(metadatum))) | |
744 str << *iptcdatum; | |
745 #if EXIV2_TEST_VERSION(0,16,0) | |
746 else if ((xmpdatum = dynamic_cast<Exiv2::Xmpdatum *>(metadatum))) | |
747 str << *xmpdatum; | |
748 #endif | |
749 | |
1288 | 750 return utf8_validate_or_convert(str.str().c_str()); |
676 | 751 #endif |
183 | 752 } |
753 catch (Exiv2::AnyError& e) { | |
754 return NULL; | |
755 } | |
178 | 756 } |
757 | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
758 gchar *exif_item_get_string(ExifItem *item, int idx) |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
759 { |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
760 try { |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
761 if (!item) return NULL; |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
762 Exiv2::Metadatum *em = (Exiv2::Metadatum *)item; |
200 | 763 #if EXIV2_TEST_VERSION(0,16,0) |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
764 std::string str = em->toString(idx); |
200 | 765 #else |
766 std::string str = em->toString(); // FIXME | |
767 #endif | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
768 if (idx == 0 && str == "") str = em->toString(); |
995 | 769 if (str.length() > 5 && str.substr(0, 5) == "lang=") |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
770 { |
995 | 771 std::string::size_type pos = str.find_first_of(' '); |
772 if (pos != std::string::npos) str = str.substr(pos+1); | |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
773 } |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
774 |
1288 | 775 return utf8_validate_or_convert(str.c_str()); |
188
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
776 } |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
777 catch (Exiv2::AnyError& e) { |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
778 return NULL; |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
779 } |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
780 } |
0584cb78aa14
write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents:
187
diff
changeset
|
781 |
178 | 782 |
783 gint exif_item_get_integer(ExifItem *item, gint *value) | |
784 { | |
184 | 785 try { |
786 if (!item) return 0; | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
787 *value = ((Exiv2::Metadatum *)item)->toLong(); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
788 return 1; |
184 | 789 } |
790 catch (Exiv2::AnyError& e) { | |
791 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
792 return 0; | |
793 } | |
178 | 794 } |
795 | |
1058
b600689a677e
Fix up few signed vs unsigned warnings: exif_item_get_rational() last parameter is now of guint type.
zas_
parents:
1055
diff
changeset
|
796 ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n) |
178 | 797 { |
184 | 798 try { |
799 if (!item) return NULL; | |
1052 | 800 if (n >= exif_item_get_elements(item)) return NULL; |
801 Exiv2::Rational v = ((Exiv2::Metadatum *)item)->toRational(n); | |
184 | 802 static ExifRational ret; |
803 ret.num = v.first; | |
804 ret.den = v.second; | |
485 | 805 if (sign) *sign = (((Exiv2::Metadatum *)item)->typeId() == Exiv2::signedRational); |
184 | 806 return &ret; |
807 } | |
808 catch (Exiv2::AnyError& e) { | |
809 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
810 return NULL; | |
811 } | |
178 | 812 } |
813 | |
1053
77ca9a5d42be
fixed charset of exiv2 strings in non-utf8 locales
nadvornik
parents:
1052
diff
changeset
|
814 gchar *exif_get_tag_description_by_key(const gchar *key) |
178 | 815 { |
184 | 816 try { |
817 Exiv2::ExifKey ekey(key); | |
1442 | 818 return utf8_validate_or_convert(ekey.tagLabel().c_str()); |
184 | 819 } |
820 catch (Exiv2::AnyError& e) { | |
1442 | 821 try { |
822 Exiv2::IptcKey ikey(key); | |
823 return utf8_validate_or_convert(ikey.tagLabel().c_str()); | |
824 } | |
825 catch (Exiv2::AnyError& e) { | |
826 try { | |
827 #if EXIV2_TEST_VERSION(0,16,0) | |
828 Exiv2::XmpKey xkey(key); | |
829 return utf8_validate_or_convert(xkey.tagLabel().c_str()); | |
830 #endif | |
831 } | |
832 catch (Exiv2::AnyError& e) { | |
833 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
834 return NULL; | |
835 } | |
836 } | |
184 | 837 } |
1442 | 838 return NULL; |
178 | 839 } |
840 | |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
841 static const AltKey *find_alt_key(const gchar *xmp_key) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
842 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
843 gint i = 0; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
844 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
845 while (alt_keys[i].xmp_key) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
846 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
847 if (strcmp(xmp_key, alt_keys[i].xmp_key) == 0) return &alt_keys[i]; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
848 i++; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
849 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
850 return NULL; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
851 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
852 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
853 static gint exif_update_metadata_simple(ExifData *exif, const gchar *key, const GList *values) |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
854 { |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
855 try { |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
856 const GList *work = values; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
857 |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
858 try { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
859 Exiv2::ExifKey ekey(key); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
860 |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
861 Exiv2::ExifData::iterator pos = exif->exifData().findKey(ekey); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
862 while (pos != exif->exifData().end()) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
863 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
864 exif->exifData().erase(pos); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
865 pos = exif->exifData().findKey(ekey); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
866 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
867 |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
868 while (work) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
869 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
870 exif->exifData()[key] = (gchar *)work->data; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
871 work = work->next; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
872 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
873 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
874 catch (Exiv2::AnyError& e) { |
1245 | 875 #if EXIV2_TEST_VERSION(0,16,0) |
876 try | |
877 #endif | |
878 { | |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
879 Exiv2::IptcKey ekey(key); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
880 Exiv2::IptcData::iterator pos = exif->iptcData().findKey(ekey); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
881 while (pos != exif->iptcData().end()) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
882 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
883 exif->iptcData().erase(pos); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
884 pos = exif->iptcData().findKey(ekey); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
885 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
886 |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
887 while (work) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
888 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
889 exif->iptcData()[key] = (gchar *)work->data; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
890 work = work->next; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
891 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
892 } |
1245 | 893 #if EXIV2_TEST_VERSION(0,16,0) |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
894 catch (Exiv2::AnyError& e) { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
895 Exiv2::XmpKey ekey(key); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
896 Exiv2::XmpData::iterator pos = exif->xmpData().findKey(ekey); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
897 while (pos != exif->xmpData().end()) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
898 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
899 exif->xmpData().erase(pos); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
900 pos = exif->xmpData().findKey(ekey); |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
901 } |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
902 |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
903 while (work) |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
904 { |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
905 exif->xmpData()[key] = (gchar *)work->data; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
906 work = work->next; |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
907 } |
1245 | 908 } |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
909 #endif |
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
910 } |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
911 return 1; |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
912 } |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
913 catch (Exiv2::AnyError& e) { |
1203
43bfcbb62cd6
prepared infrastructure for delayed metadata writting - refreshing
nadvornik
parents:
1196
diff
changeset
|
914 std::cout << "Caught Exiv2 exception '" << e << "'\n"; |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
915 return 0; |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
916 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
917 } |
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
918 |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
919 gint exif_update_metadata(ExifData *exif, const gchar *key, const GList *values) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
920 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
921 gint ret = exif_update_metadata_simple(exif, key, values); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
922 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
923 if ( |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
924 #if !EXIV2_TEST_VERSION(0,17,0) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
925 TRUE || /* no conversion support */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
926 #endif |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
927 !values || /* deleting item */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
928 !ret /* writing to the explicitely given xmp tag failed */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
929 ) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
930 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
931 /* deleted xmp metadatum can't be converted, we have to delete also the corresponding legacy tag */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
932 /* if we can't write xmp, update at least the legacy tag */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
933 const AltKey *alt_key = find_alt_key(key); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
934 if (alt_key && alt_key->iptc_key) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
935 ret = exif_update_metadata_simple(exif, alt_key->iptc_key, values); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
936 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
937 if (alt_key && alt_key->exif_key) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
938 ret = exif_update_metadata_simple(exif, alt_key->exif_key, values); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
939 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
940 return ret; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
941 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
942 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
943 |
1288 | 944 static GList *exif_add_value_to_glist(GList *list, Exiv2::Metadatum &item, MetadataFormat format, const Exiv2::ExifData *metadata) |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
945 { |
1245 | 946 #if EXIV2_TEST_VERSION(0,16,0) |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
947 Exiv2::TypeId id = item.typeId(); |
1288 | 948 if (format == METADATA_FORMATTED || |
949 id == Exiv2::asciiString || | |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
950 id == Exiv2::undefined || |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
951 id == Exiv2::string || |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
952 id == Exiv2::date || |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
953 id == Exiv2::time || |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
954 id == Exiv2::xmpText || |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
955 id == Exiv2::langAlt || |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
956 id == Exiv2::comment |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
957 ) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
958 { |
1245 | 959 #endif |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
960 /* read as a single entry */ |
1288 | 961 std::string str; |
962 | |
963 if (format == METADATA_FORMATTED) | |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
964 { |
1288 | 965 #if EXIV2_TEST_VERSION(0,17,0) |
966 str = item.print( | |
967 #if EXIV2_TEST_VERSION(0,18,0) | |
968 metadata | |
969 #endif | |
970 ); | |
971 #else | |
972 std::stringstream stream; | |
973 Exiv2::Exifdatum *exifdatum; | |
974 Exiv2::Iptcdatum *iptcdatum; | |
975 #if EXIV2_TEST_VERSION(0,16,0) | |
976 Exiv2::Xmpdatum *xmpdatum; | |
977 #endif | |
978 if ((exifdatum = dynamic_cast<Exiv2::Exifdatum *>(metadatum))) | |
979 stream << *exifdatum; | |
980 else if ((iptcdatum = dynamic_cast<Exiv2::Iptcdatum *>(metadatum))) | |
981 stream << *iptcdatum; | |
982 #if EXIV2_TEST_VERSION(0,16,0) | |
983 else if ((xmpdatum = dynamic_cast<Exiv2::Xmpdatum *>(metadatum))) | |
984 stream << *xmpdatum; | |
985 #endif | |
986 str = stream.str(); | |
987 #endif | |
988 if (str.length() > 1024) | |
989 { | |
990 /* truncate very long strings, they cause problems in gui */ | |
991 str.erase(1024); | |
992 str.append("..."); | |
993 } | |
994 } | |
995 else | |
996 { | |
997 str = item.toString(); | |
998 if (str.length() > 5 && str.substr(0, 5) == "lang=") | |
999 { | |
1000 std::string::size_type pos = str.find_first_of(' '); | |
1001 if (pos != std::string::npos) str = str.substr(pos+1); | |
1002 } | |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1003 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1004 list = g_list_append(list, utf8_validate_or_convert(str.c_str())); |
1245 | 1005 #if EXIV2_TEST_VERSION(0,16,0) |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1006 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1007 else |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1008 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1009 /* read as a list */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1010 gint i; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1011 for (i = 0; i < item.count(); i++) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1012 list = g_list_append(list, utf8_validate_or_convert(item.toString(i).c_str())); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1013 } |
1245 | 1014 #endif |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1015 return list; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1016 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1017 |
1288 | 1018 static GList *exif_get_metadata_simple(ExifData *exif, const gchar *key, MetadataFormat format) |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1019 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1020 GList *list = NULL; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1021 try { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1022 try { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1023 Exiv2::ExifKey ekey(key); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1024 Exiv2::ExifData::iterator pos = exif->exifData().findKey(ekey); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1025 if (pos != exif->exifData().end()) |
1288 | 1026 list = exif_add_value_to_glist(list, *pos, format, &exif->exifData()); |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1027 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1028 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1029 catch (Exiv2::AnyError& e) { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1030 try { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1031 Exiv2::IptcKey ekey(key); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1032 Exiv2::IptcData::iterator pos = exif->iptcData().begin(); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1033 while (pos != exif->iptcData().end()) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1034 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1035 if (pos->key() == key) |
1288 | 1036 list = exif_add_value_to_glist(list, *pos, format, NULL); |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1037 ++pos; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1038 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1039 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1040 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1041 catch (Exiv2::AnyError& e) { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1042 #if EXIV2_TEST_VERSION(0,16,0) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1043 Exiv2::XmpKey ekey(key); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1044 Exiv2::XmpData::iterator pos = exif->xmpData().findKey(ekey); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1045 if (pos != exif->xmpData().end()) |
1288 | 1046 list = exif_add_value_to_glist(list, *pos, format, NULL); |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1047 #endif |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1048 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1049 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1050 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1051 catch (Exiv2::AnyError& e) { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1052 std::cout << "Caught Exiv2 exception '" << e << "'\n"; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1053 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1054 return list; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1055 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1056 |
1288 | 1057 GList *exif_get_metadata(ExifData *exif, const gchar *key, MetadataFormat format) |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1058 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1059 GList *list = NULL; |
1288 | 1060 |
1061 if (!key) return NULL; | |
1062 | |
1063 if (format == METADATA_FORMATTED) | |
1064 { | |
1065 gchar *text; | |
1066 gint key_valid; | |
1067 text = exif_get_formatted_by_key(exif, key, &key_valid); | |
1068 if (key_valid) return g_list_append(NULL, text); | |
1069 } | |
1070 | |
1071 list = exif_get_metadata_simple(exif, key, format); | |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1072 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1073 /* the following code can be ifdefed out as soon as Exiv2 supports it */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1074 if (!list) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1075 { |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1076 const AltKey *alt_key = find_alt_key(key); |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1077 if (alt_key && alt_key->iptc_key) |
1288 | 1078 list = exif_get_metadata_simple(exif, alt_key->iptc_key, format); |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1079 |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1080 #if !EXIV2_TEST_VERSION(0,17,0) |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1081 /* with older Exiv2 versions exif is not synced */ |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1082 if (!list && alt_key && alt_key->exif_key) |
1288 | 1083 list = exif_get_metadata_simple(exif, alt_key->exif_key, format); |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1084 #endif |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1085 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1086 return list; |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1087 } |
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1224
diff
changeset
|
1088 |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
1089 |
449 | 1090 void exif_add_jpeg_color_profile(ExifData *exif, unsigned char *cp_data, guint cp_length) |
1091 { | |
1069 | 1092 exif->add_jpeg_color_profile(cp_data, cp_length); |
449 | 1093 } |
1094 | |
1008 | 1095 guchar *exif_get_color_profile(ExifData *exif, guint *data_len) |
449 | 1096 { |
1069 | 1097 guchar *ret = exif->get_jpeg_color_profile(data_len); |
1098 if (ret) return ret; | |
1099 | |
449 | 1100 ExifItem *prof_item = exif_get_item(exif, "Exif.Image.InterColorProfile"); |
1101 if (prof_item && exif_item_get_format_id(prof_item) == EXIF_FORMAT_UNDEFINED) | |
1069 | 1102 ret = (guchar *)exif_item_get_data(prof_item, data_len); |
1103 return ret; | |
449 | 1104 } |
1105 | |
1008 | 1106 #if EXIV2_TEST_VERSION(0,17,90) |
187
9eafc4957f1a
write support in Exiv2 wrapper; for now only string values
nadvornik
parents:
186
diff
changeset
|
1107 |
1060 | 1108 guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height) |
1008 | 1109 { |
1110 if (!exif) return NULL; | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1111 |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
1112 if (!exif->image()) return NULL; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
1113 |
1069 | 1114 const char* path = exif->image()->io().path().c_str(); |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1115 /* given image pathname, first do simple (and fast) file extension test */ |
1060 | 1116 gboolean is_raw = filter_file_class(path, FORMAT_CLASS_RAWIMAGE); |
1117 | |
1118 if (!is_raw && requested_width == 0) return NULL; | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1119 |
1008 | 1120 try { |
1121 | |
1069 | 1122 Exiv2::PreviewManager pm(*exif->image()); |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1123 |
1064 | 1124 Exiv2::PreviewPropertiesList list = pm.getPreviewProperties(); |
1008 | 1125 |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1126 if (!list.empty()) |
1008 | 1127 { |
1060 | 1128 Exiv2::PreviewPropertiesList::iterator pos; |
1129 Exiv2::PreviewPropertiesList::iterator last = --list.end(); | |
1130 | |
1131 if (requested_width == 0) | |
1132 { | |
1133 pos = last; // the largest | |
1134 } | |
1135 else | |
1136 { | |
1137 pos = list.begin(); | |
1138 while (pos != last) | |
1139 { | |
1140 if (pos->width_ >= (uint32_t)requested_width && | |
1141 pos->height_ >= (uint32_t)requested_height) break; | |
1142 ++pos; | |
1143 } | |
1144 | |
1145 // we are not interested in smaller thumbnails in normal image formats - we can use full image instead | |
1146 if (!is_raw) | |
1147 { | |
1148 if (pos->width_ < (uint32_t)requested_width || pos->height_ < (uint32_t)requested_height) return NULL; | |
1149 } | |
1150 } | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1151 |
1064 | 1152 Exiv2::PreviewImage image = pm.getPreviewImage(*pos); |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1153 |
1064 | 1154 Exiv2::DataBuf buf = image.copy(); |
1008 | 1155 std::pair<Exiv2::byte*, long> p = buf.release(); |
1156 | |
1157 *data_len = p.second; | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1158 return p.first; |
1008 | 1159 } |
1160 return NULL; | |
1161 } | |
1162 catch (Exiv2::AnyError& e) { | |
1163 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
1164 return NULL; | |
1165 } | |
1166 } | |
1167 | |
1168 void exif_free_preview(guchar *buf) | |
1169 { | |
1170 delete[] (Exiv2::byte*)buf; | |
1171 } | |
1172 #endif | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1173 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1174 } |
1008 | 1175 #if !EXIV2_TEST_VERSION(0,17,90) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1176 |
995 | 1177 /* This is a dirty hack to support raw file preview, bassed on |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1178 tiffparse.cpp from Exiv2 examples */ |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1179 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1180 class RawFile { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1181 public: |
995 | 1182 |
1008 | 1183 RawFile(Exiv2::BasicIo &io); |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1184 ~RawFile(); |
995 | 1185 |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1186 const Exiv2::Value *find(uint16_t tag, uint16_t group); |
995 | 1187 |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1188 unsigned long preview_offset(); |
995 | 1189 |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1190 private: |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1191 int type; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1192 Exiv2::TiffComponent::AutoPtr rootDir; |
1008 | 1193 Exiv2::BasicIo &io_; |
1194 const Exiv2::byte *map_data; | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1195 size_t map_len; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1196 unsigned long offset; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1197 }; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1198 |
1008 | 1199 typedef struct _UnmapData UnmapData; |
1200 struct _UnmapData | |
1201 { | |
1202 guchar *ptr; | |
1203 guchar *map_data; | |
1204 size_t map_len; | |
1205 }; | |
1206 | |
1207 static GList *exif_unmap_list = 0; | |
1208 | |
1060 | 1209 extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, gint requested_height) |
1008 | 1210 { |
1211 unsigned long offset; | |
1212 | |
1213 if (!exif) return NULL; | |
1426
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
1214 if (!exif->image()) return NULL; |
cd88fe4e5588
handle sidecar files for raw formats that are not known to exiv2
nadvornik
parents:
1422
diff
changeset
|
1215 |
1069 | 1216 const char* path = exif->image()->io().path().c_str(); |
1008 | 1217 |
1218 /* given image pathname, first do simple (and fast) file extension test */ | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1219 if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL; |
1008 | 1220 |
1221 try { | |
1222 struct stat st; | |
1223 guchar *map_data; | |
1224 size_t map_len; | |
1225 UnmapData *ud; | |
1226 int fd; | |
1227 | |
1069 | 1228 RawFile rf(exif->image()->io()); |
1008 | 1229 offset = rf.preview_offset(); |
1230 DEBUG_1("%s: offset %lu", path, offset); | |
1231 | |
1232 fd = open(path, O_RDONLY); | |
1233 if (fd == -1) | |
1234 { | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1235 return NULL; |
1008 | 1236 } |
1237 | |
1238 if (fstat(fd, &st) == -1) | |
1239 { | |
1240 close(fd); | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1241 return NULL; |
1008 | 1242 } |
1243 map_len = st.st_size; | |
1244 map_data = (guchar *) mmap(0, map_len, PROT_READ, MAP_PRIVATE, fd, 0); | |
1245 close(fd); | |
1246 if (map_data == MAP_FAILED) | |
1247 { | |
1048
95c418661be8
updated preview loader to work with current svn version of libexiv2
nadvornik
parents:
1025
diff
changeset
|
1248 return NULL; |
1008 | 1249 } |
1250 *data_len = map_len - offset; | |
1251 ud = g_new(UnmapData, 1); | |
1252 ud->ptr = map_data + offset; | |
1253 ud->map_data = map_data; | |
1254 ud->map_len = map_len; | |
1255 | |
1256 exif_unmap_list = g_list_prepend(exif_unmap_list, ud); | |
1257 return ud->ptr; | |
1258 | |
1259 } | |
1260 catch (Exiv2::AnyError& e) { | |
1261 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
1262 } | |
1263 return NULL; | |
1264 | |
1265 } | |
1266 | |
1267 void exif_free_preview(guchar *buf) | |
1268 { | |
1269 GList *work = exif_unmap_list; | |
1270 | |
1271 while (work) | |
1272 { | |
1273 UnmapData *ud = (UnmapData *)work->data; | |
1274 if (ud->ptr == buf) | |
1275 { | |
1276 munmap(ud->map_data, ud->map_len); | |
1277 exif_unmap_list = g_list_remove_link(exif_unmap_list, work); | |
1278 g_free(ud); | |
1279 return; | |
1280 } | |
1025 | 1281 work = work->next; |
1008 | 1282 } |
1283 g_assert_not_reached(); | |
1284 } | |
1285 | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1286 using namespace Exiv2; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1287 |
1008 | 1288 RawFile::RawFile(BasicIo &io) : io_(io), map_data(NULL), map_len(0), offset(0) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1289 { |
1008 | 1290 /* |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1291 struct stat st; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1292 if (fstat(fd, &st) == -1) |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1293 { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1294 throw Error(14); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1295 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1296 map_len = st.st_size; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1297 map_data = (Exiv2::byte *) mmap(0, map_len, PROT_READ, MAP_PRIVATE, fd, 0); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1298 if (map_data == MAP_FAILED) |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1299 { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1300 throw Error(14); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1301 } |
1008 | 1302 */ |
1303 if (io.open() != 0) { | |
1304 throw Error(9, io.path(), strError()); | |
1305 } | |
1306 | |
1307 map_data = io.mmap(); | |
1308 map_len = io.size(); | |
1309 | |
1310 | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1311 type = Exiv2::ImageFactory::getType(map_data, map_len); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1312 |
200 | 1313 #if EXIV2_TEST_VERSION(0,16,0) |
201 | 1314 TiffHeaderBase *tiffHeader = NULL; |
200 | 1315 #else |
201 | 1316 TiffHeade2 *tiffHeader = NULL; |
200 | 1317 #endif |
201 | 1318 Cr2Header *cr2Header = NULL; |
1319 | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1320 switch (type) { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1321 case Exiv2::ImageType::tiff: |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1322 tiffHeader = new TiffHeade2(); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1323 break; |
201 | 1324 case Exiv2::ImageType::cr2: |
1325 cr2Header = new Cr2Header(); | |
1326 break; | |
200 | 1327 #if EXIV2_TEST_VERSION(0,16,0) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1328 case Exiv2::ImageType::orf: |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1329 tiffHeader = new OrfHeader(); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1330 break; |
200 | 1331 #endif |
1332 #if EXIV2_TEST_VERSION(0,13,0) | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1333 case Exiv2::ImageType::raf: |
995 | 1334 if (map_len < 84 + 4) throw Error(14); |
1335 offset = getULong(map_data + 84, bigEndian); | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1336 return; |
200 | 1337 #endif |
191 | 1338 case Exiv2::ImageType::crw: |
1339 { | |
1340 // Parse the image, starting with a CIFF header component | |
1341 Exiv2::CiffHeader::AutoPtr parseTree(new Exiv2::CiffHeader); | |
1342 parseTree->read(map_data, map_len); | |
995 | 1343 CiffComponent *entry = parseTree->findComponent(0x2007, 0); |
191 | 1344 if (entry) offset = entry->pData() - map_data; |
1345 return; | |
1346 } | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1347 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1348 default: |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1349 throw Error(3, "RAW"); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1350 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1351 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1352 // process tiff-like formats |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1353 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1354 TiffCompFactoryFct createFct = TiffCreator::create; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1355 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1356 rootDir = createFct(Tag::root, Group::none); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1357 if (0 == rootDir.get()) { |
995 | 1358 throw Error(1, "No root element defined in TIFF structure"); |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1359 } |
201 | 1360 |
1361 if (tiffHeader) | |
1362 { | |
1363 if (!tiffHeader->read(map_data, map_len)) throw Error(3, "TIFF"); | |
200 | 1364 #if EXIV2_TEST_VERSION(0,16,0) |
201 | 1365 rootDir->setStart(map_data + tiffHeader->offset()); |
200 | 1366 #else |
201 | 1367 rootDir->setStart(map_data + tiffHeader->ifdOffset()); |
200 | 1368 #endif |
201 | 1369 } |
1370 | |
1371 if (cr2Header) | |
1372 { | |
1373 rootDir->setStart(map_data + cr2Header->offset()); | |
1374 } | |
1375 | |
1376 TiffRwState::AutoPtr state(new TiffRwState(tiffHeader ? tiffHeader->byteOrder() : littleEndian, 0, createFct)); | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1377 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1378 TiffReader reader(map_data, |
995 | 1379 map_len, |
1380 rootDir.get(), | |
1381 state); | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1382 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1383 rootDir->accept(reader); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1384 |
995 | 1385 if (tiffHeader) |
201 | 1386 delete tiffHeader; |
995 | 1387 if (cr2Header) |
201 | 1388 delete cr2Header; |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1389 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1390 |
609
b690cecbf5b8
Use function(void) instead of function() for declaring functions which
zas_
parents:
586
diff
changeset
|
1391 RawFile::~RawFile(void) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1392 { |
1008 | 1393 io_.munmap(); |
1394 io_.close(); | |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1395 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1396 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1397 const Value * RawFile::find(uint16_t tag, uint16_t group) |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1398 { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1399 TiffFinder finder(tag, group); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1400 rootDir->accept(finder); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1401 TiffEntryBase* te = dynamic_cast<TiffEntryBase*>(finder.result()); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1402 if (te) |
194 | 1403 { |
495 | 1404 DEBUG_1("(tag: %04x %04x) ", tag, group); |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1405 return te->pValue(); |
194 | 1406 } |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1407 else |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1408 return NULL; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1409 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1410 |
609
b690cecbf5b8
Use function(void) instead of function() for declaring functions which
zas_
parents:
586
diff
changeset
|
1411 unsigned long RawFile::preview_offset(void) |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1412 { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1413 const Value *val; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1414 if (offset) return offset; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1415 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1416 if (type == Exiv2::ImageType::cr2) |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1417 { |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1418 val = find(0x111, Group::ifd0); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1419 if (val) return val->toLong(); |
995 | 1420 |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1421 return 0; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1422 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1423 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1424 val = find(0x201, Group::sub0_0); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1425 if (val) return val->toLong(); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1426 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1427 val = find(0x201, Group::ifd0); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1428 if (val) return val->toLong(); |
995 | 1429 |
186
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1430 val = find(0x201, Group::ignr); // for PEF files, originally it was probably ifd2 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1431 if (val) return val->toLong(); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1432 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1433 val = find(0x111, Group::sub0_1); // dng |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1434 if (val) return val->toLong(); |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1435 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1436 return 0; |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1437 } |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1438 |
bd3fc1aa7fe9
a hack to read raw previews with exiv2 0.16, however it should be fixed
nadvornik
parents:
185
diff
changeset
|
1439 |
1008 | 1440 #endif |
178 | 1441 |
1442 | |
995 | 1443 #endif |
178 | 1444 /* HAVE_EXIV2 */ |
1055
1646720364cf
Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents:
1053
diff
changeset
|
1445 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |