[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=60f4c18

The following commit has been merged in the master branch:
commit 60f4c18da77fb594d3008b861816dd44c69fa624
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Apr 27 20:07:39 2015 +0000

    Move dumpLibraryInfo() to Exiv2 namespace.
---
 include/exiv2/version.hpp | 9 ++++++---
 src/exiv2.cpp             | 2 +-
 src/version.cpp           | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp
index 4417762..a346e77 100644
--- a/include/exiv2/version.hpp
+++ b/include/exiv2/version.hpp
@@ -183,11 +183,14 @@ namespace Exiv2 {
       @endcode
      */
     EXIV2API bool testVersion(int major, int minor, int patch);
+
+    /*!
+      @brief dumpLibraryInfo implements the exiv2 option --version --verbose
+             used by exiv2 test suite to inspect libraries loaded at run-time
+     */
+    EXIV2API void dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys);
 }                                       // namespace Exiv2
 
-// dumpLibraryInfo is general purpose and not in the Exiv2 namespace
-// used by exiv2 test suite to inspect libraries loaded at run-time
-EXIV2API void dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys);
 
 
 #endif                                  // VERSION_HPP_
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index bd37450..d72870a 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -234,7 +234,7 @@ void Params::version(bool verbose,std::ostream& os) const
             "Boston, MA 02110-1301 USA
");
     }
 
-    if ( verbose ) dumpLibraryInfo(os,Params::instance().greps_);
+    if ( verbose ) Exiv2::dumpLibraryInfo(os,Params::instance().greps_);
 }
 
 void Params::usage(std::ostream& os) const
diff --git a/src/version.cpp b/src/version.cpp
index 555872c..59b0a58 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -168,7 +168,7 @@ static void output(std::ostream& os,const exv_grep_keys_t& greps,const char* nam
     output(os,greps,name,stringStream.str());
 }
 
-    void dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
+void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
 {
     string_v libs; // libs[0] == executable
 

-- 
exiv2 packaging