Lines 235-244
Link Here
|
235 |
const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) { |
235 |
const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) { |
236 |
g_return_val_if_fail(tag != NULL, NULL); |
236 |
g_return_val_if_fail(tag != NULL, NULL); |
237 |
|
237 |
|
238 |
Exiv2::ExifKey key(tag); |
|
|
239 |
|
240 |
try { |
238 |
try { |
|
|
239 |
Exiv2::ExifKey key(tag); |
240 |
#if EXIV2_TEST_VERSION(0, 21, 0) |
241 |
return g_intern_string(key.tagLabel().c_str()); |
242 |
#else |
241 |
return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ()); |
243 |
return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ()); |
|
|
244 |
#endif |
242 |
} catch (Exiv2::Error& e) { |
245 |
} catch (Exiv2::Error& e) { |
243 |
LOG_ERROR(e); |
246 |
LOG_ERROR(e); |
244 |
} |
247 |
} |
Lines 249-258
Link Here
|
249 |
const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) { |
252 |
const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) { |
250 |
g_return_val_if_fail(tag != NULL, NULL); |
253 |
g_return_val_if_fail(tag != NULL, NULL); |
251 |
|
254 |
|
252 |
Exiv2::ExifKey key(tag); |
|
|
253 |
|
254 |
try { |
255 |
try { |
|
|
256 |
Exiv2::ExifKey key(tag); |
257 |
#if EXIV2_TEST_VERSION(0, 21, 0) |
258 |
return g_intern_string(key.tagDesc().c_str()); |
259 |
#else |
255 |
return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ()); |
260 |
return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ()); |
|
|
261 |
#endif |
256 |
} catch (Exiv2::Error& e) { |
262 |
} catch (Exiv2::Error& e) { |
257 |
LOG_ERROR(e); |
263 |
LOG_ERROR(e); |
258 |
} |
264 |
} |