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