[Kde-imaging] branches/extragear/kde3/libs/libkexiv2/libkexiv2

[Angelo Naselli]

SVN commit 754872 by anaselli:

Breakage of the year, new static method version has been added

CCMAIL:  kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +11 -3     kexiv2.cpp  
 M  +15 -12    kexiv2.h  


--- branches/extragear/kde3/libs/libkexiv2/libkexiv2/Makefile.am #754871:754872
@@ -7,7 +7,7 @@
 
 libkexiv2_la_SOURCES = kexiv2.cpp
 
-libkexiv2_version_info = 3:0:0
+libkexiv2_version_info = 4:0:0
 libkexiv2_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info $(libkexiv2_version_info) -no-undefined
 libkexiv2_la_LIBADD  = $(EXIV2_LIBS) $(LIB_KDECORE) $(LIB_QT)
 
--- branches/extragear/kde3/libs/libkexiv2/libkexiv2/kexiv2.cpp #754871:754872
@@ -77,6 +77,7 @@
 
 // Local includes.
 
+#include "version.h"
 #include "kexiv2.h"
 
 namespace KExiv2Iface
@@ -95,8 +96,10 @@
     Exiv2::ExifData exifMetadata;
 
     Exiv2::IptcData iptcMetadata;
+
 };
 
+
 KExiv2::KExiv2()
 {
     d = new KExiv2Priv;
@@ -113,6 +116,11 @@
     delete d;
 }
 
+QString KExiv2::version()
+{
+  return QString( kexiv2_version );
+}
+
 QString KExiv2::Exiv2Version()
 {
     // Since 0.14.0 release, we can extract run-time version of Exiv2.
@@ -120,7 +128,7 @@
 
 #if (EXIV2_TEST_VERSION(0,14,0))
     return QString(Exiv2::version());
-#else	   
+#else
     return QString("%1.%2.%3").arg(EXIV2_MAJOR_VERSION)
                               .arg(EXIV2_MINOR_VERSION)
                               .arg(EXIV2_PATCH_VERSION);
@@ -129,7 +137,7 @@
 
 void KExiv2::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e)
 {
-    std::string s(e.what());    
+    std::string s(e.what());
     qDebug("%s (Error #%i: %s)", msg.ascii(), e.code(), s.c_str());
 }
 
@@ -156,7 +164,7 @@
 bool KExiv2::clearExif()
 {
     try
-    {    
+    {
         d->exifMetadata.clear();
         return true;
     }
--- branches/extragear/kde3/libs/libkexiv2/libkexiv2/kexiv2.h #754871:754872
@@ -66,23 +66,23 @@
     /** The image color workspace values given by Exif metadata. */
     enum ImageColorWorkSpace
     {
-        WORKSPACE_UNSPECIFIED  = 0,    
-        WORKSPACE_SRGB         = 1,    
-        WORKSPACE_ADOBERGB     = 2,    
-        WORKSPACE_UNCALIBRATED = 65535 
+        WORKSPACE_UNSPECIFIED  = 0,
+        WORKSPACE_SRGB         = 1,
+        WORKSPACE_ADOBERGB     = 2,
+        WORKSPACE_UNCALIBRATED = 65535
     };
 
     /** The image orientation values given by Exif metadata. */
     enum ImageOrientation
     {
-        ORIENTATION_UNSPECIFIED  = 0, 
-        ORIENTATION_NORMAL       = 1, 
-        ORIENTATION_HFLIP        = 2, 
-        ORIENTATION_ROT_180      = 3, 
-        ORIENTATION_VFLIP        = 4, 
-        ORIENTATION_ROT_90_HFLIP = 5, 
-        ORIENTATION_ROT_90       = 6, 
-        ORIENTATION_ROT_90_VFLIP = 7, 
+        ORIENTATION_UNSPECIFIED  = 0,
+        ORIENTATION_NORMAL       = 1,
+        ORIENTATION_HFLIP        = 2,
+        ORIENTATION_ROT_180      = 3,
+        ORIENTATION_VFLIP        = 4,
+        ORIENTATION_ROT_90_HFLIP = 5,
+        ORIENTATION_ROT_90       = 6,
+        ORIENTATION_ROT_90_VFLIP = 7,
         ORIENTATION_ROT_270      = 8
     };
 
@@ -104,6 +104,9 @@
     /** Return a string version of Exiv2 release in format "major.minor.patch" */ 
     static QString Exiv2Version();
 
+    /** Return a string version of libkexiv2 release */
+    static QString version();
+
     /** Generic method to print the Exiv2 C++ Exception error message from 'e'.
         'msg' string is printed just before like debug header.
     */