summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-31 20:41:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-31 20:41:56 +0000
commitf3a5b478cb5b0314cf632647695be4299941dd27 (patch)
tree3185dd0d6d44111f9943d4c491befb402f91d85f
parent9537154bbf389a6ae5ccbff822ffcc3a5269a93c (diff)
downloadlibkexiv2-f3a5b478.tar.gz
libkexiv2-f3a5b478.zip
Fix libkexiv build failure under Exiv >= 0.21
Thanks to Albert Vaca for the patch! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/libkexiv2@1244225 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--libkexiv2/libkexiv2/kexiv2.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/libkexiv2/libkexiv2/kexiv2.cpp b/libkexiv2/libkexiv2/kexiv2.cpp
index 8fff593..67a8d30 100644
--- a/libkexiv2/libkexiv2/kexiv2.cpp
+++ b/libkexiv2/libkexiv2/kexiv2.cpp
@@ -1603,7 +1603,11 @@ TQString KExiv2::getExifTagTitle(const char *exifTagName)
{
std::string exifkey(exifTagName);
Exiv2::ExifKey ek(exifkey);
+#if EXIV2_TEST_VERSION(0, 21, 0)
+ return TQString::fromLocal8Bit( ek.tagLabel().c_str() );
+#else
return TQString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) );
+#endif
}
catch (Exiv2::Error& e)
{
@@ -1619,7 +1623,11 @@ TQString KExiv2::getExifTagDescription(const char *exifTagName)
{
std::string exifkey(exifTagName);
Exiv2::ExifKey ek(exifkey);
+#if EXIV2_TEST_VERSION(0, 21, 0)
+ return TQString::fromLocal8Bit( ek.tagDesc().c_str() );
+#else
return TQString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) );
+#endif
}
catch (Exiv2::Error& e)
{