diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp index 44177622..a346e779 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 bd37450a..d72870ac 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\n"); } - 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 555872c0..59b0a582 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