From f3a5b478cb5b0314cf632647695be4299941dd27 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 31 Jul 2011 20:41:56 +0000
Subject: 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
---
 libkexiv2/libkexiv2/kexiv2.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

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)
     {
-- 
cgit v1.2.3