Mercurial > geeqie
comparison src/exiv2.cc @ 180:e6c8cf017d68
more exiv2 fixes
author | nadvornik |
---|---|
date | Wed, 13 Feb 2008 17:47:55 +0000 |
parents | 37004d5a584a |
children | 8a417f10ba09 |
comparison
equal
deleted
inserted
replaced
179:37004d5a584a | 180:e6c8cf017d68 |
---|---|
50 return g_strdup(exif->exifData[key].toString().c_str()); | 50 return g_strdup(exif->exifData[key].toString().c_str()); |
51 } | 51 } |
52 | 52 |
53 gint exif_get_integer(ExifData *exif, const gchar *key, gint *value) | 53 gint exif_get_integer(ExifData *exif, const gchar *key, gint *value) |
54 { | 54 { |
55 return exif->exifData[key].toLong(); | 55 Exiv2::ExifKey ekey(key); |
56 Exiv2::ExifData::iterator pos = exif->exifData.findKey(ekey); | |
57 if (pos == exif->exifData.end()) return 0; | |
58 *value = pos->getValue()->toLong(); | |
59 | |
60 return 1; | |
56 } | 61 } |
57 | 62 |
58 ExifRational *exif_get_rational(ExifData *exif, const gchar *key, gint *sign) | 63 ExifRational *exif_get_rational(ExifData *exif, const gchar *key, gint *sign) |
59 { | 64 { |
60 /* Exiv2::Rational v = exif->exifData[key]; | 65 /* Exiv2::Rational v = exif->exifData[key]; |
93 return (ExifItem *)item; | 98 return (ExifItem *)item; |
94 } | 99 } |
95 | 100 |
96 const char *exif_item_get_tag_name(ExifItem *item) | 101 const char *exif_item_get_tag_name(ExifItem *item) |
97 { | 102 { |
98 return ((Exiv2::Exifdatum *)item)->tagName().c_str(); | 103 return ((Exiv2::Exifdatum *)item)->key().c_str(); |
99 } | 104 } |
100 | 105 |
101 guint exif_item_get_tag_id(ExifItem *item) | 106 guint exif_item_get_tag_id(ExifItem *item) |
102 { | 107 { |
103 return ((Exiv2::Exifdatum *)item)->idx(); | 108 return ((Exiv2::Exifdatum *)item)->tag(); |
104 } | 109 } |
105 | 110 |
106 guint exif_item_get_elements(ExifItem *item) | 111 guint exif_item_get_elements(ExifItem *item) |
107 { | 112 { |
108 return ((Exiv2::Exifdatum *)item)->count(); | 113 return ((Exiv2::Exifdatum *)item)->count(); |
145 { | 150 { |
146 return ((Exiv2::Exifdatum *)item)->typeId(); | 151 return ((Exiv2::Exifdatum *)item)->typeId(); |
147 } | 152 } |
148 const char *exif_item_get_format_name(ExifItem *item, gint brief) | 153 const char *exif_item_get_format_name(ExifItem *item, gint brief) |
149 { | 154 { |
150 /* | 155 return ((Exiv2::Exifdatum *)item)->typeName(); |
151 return exif_item_get_tag_name(item); | |
152 */ | |
153 } | 156 } |
154 | 157 |
155 | 158 |
156 gchar *exif_item_get_data_as_text(ExifItem *item) | 159 gchar *exif_item_get_data_as_text(ExifItem *item) |
157 { | 160 { |