Mercurial > geeqie.yaz
comparison src/exiv2.cc @ 1442:e37cde2857c1
fixed XMP and IPTC entry names in exif pane
author | nadvornik |
---|---|
date | Sun, 15 Mar 2009 12:41:39 +0000 |
parents | cd88fe4e5588 |
children | 8178ef34d257 |
comparison
equal
deleted
inserted
replaced
1441:2908c28eb593 | 1442:e37cde2857c1 |
---|---|
795 | 795 |
796 gchar *exif_get_tag_description_by_key(const gchar *key) | 796 gchar *exif_get_tag_description_by_key(const gchar *key) |
797 { | 797 { |
798 try { | 798 try { |
799 Exiv2::ExifKey ekey(key); | 799 Exiv2::ExifKey ekey(key); |
800 return utf8_validate_or_convert(Exiv2::ExifTags::tagLabel(ekey.tag(), ekey.ifdId ())); | 800 return utf8_validate_or_convert(ekey.tagLabel().c_str()); |
801 } | 801 } |
802 catch (Exiv2::AnyError& e) { | 802 catch (Exiv2::AnyError& e) { |
803 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | 803 try { |
804 return NULL; | 804 Exiv2::IptcKey ikey(key); |
805 } | 805 return utf8_validate_or_convert(ikey.tagLabel().c_str()); |
806 } | |
807 catch (Exiv2::AnyError& e) { | |
808 try { | |
809 #if EXIV2_TEST_VERSION(0,16,0) | |
810 Exiv2::XmpKey xkey(key); | |
811 return utf8_validate_or_convert(xkey.tagLabel().c_str()); | |
812 #endif | |
813 } | |
814 catch (Exiv2::AnyError& e) { | |
815 std::cout << "Caught Exiv2 exception '" << e << "'\n"; | |
816 return NULL; | |
817 } | |
818 } | |
819 } | |
820 return NULL; | |
806 } | 821 } |
807 | 822 |
808 static const AltKey *find_alt_key(const gchar *xmp_key) | 823 static const AltKey *find_alt_key(const gchar *xmp_key) |
809 { | 824 { |
810 gint i = 0; | 825 gint i = 0; |