[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/libraries/libkexiv2/libkexiv2/libkexiv2
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-07-31 20:41:57
Message-ID: 20110731204157.1EDCAAC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1244225 by tpearson:

Fix libkexiv build failure under Exiv >= 0.21
Thanks to Albert Vaca for the patch!


 M  +8 -0      kexiv2.cpp  


--- branches/trinity/libraries/libkexiv2/libkexiv2/libkexiv2/kexiv2.cpp #1244224:1244225
@@ -1603,7 +1603,11 @@
     {
         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 @@
     {
         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)
     {
[prev in list] [next in list] [prev in thread] [next in thread]