media-libs/gexiv2/files/gexiv2-0.2.1-new-exiv2.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

http://bugs.gentoo.org/349150

--- gexiv2/gexiv2-metadata-exif.cpp
+++ gexiv2/gexiv2-metadata-exif.cpp
@@ -235,10 +235,13 @@
 const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) {
     g_return_val_if_fail(tag != NULL, NULL);
     
-    Exiv2::ExifKey key(tag);
-    
     try {
+        Exiv2::ExifKey key(tag);
+#if EXIV2_TEST_VERSION(0, 21, 0)
+        return g_intern_string(key.tagLabel().c_str());
+#else
         return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ());
+#endif
     } catch (Exiv2::Error& e) {
         LOG_ERROR(e);
     }
@@ -249,10 +252,13 @@
 const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) {
     g_return_val_if_fail(tag != NULL, NULL);
     
-    Exiv2::ExifKey key(tag);
-    
     try {
+        Exiv2::ExifKey key(tag);
+#if EXIV2_TEST_VERSION(0, 21, 0)
+        return g_intern_string(key.tagDesc().c_str());
+#else
         return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ());
+#endif
     } catch (Exiv2::Error& e) {
         LOG_ERROR(e);
     }