From 2f70ae43053074b68fd76efaa617e5fa0ebc1b84 Mon Sep 17 00:00:00 2001 From: clanmills Date: Thu, 15 Nov 2018 08:04:47 +0000 Subject: [PATCH] Fix getProcessPath() --- src/futils.cpp | 2 +- src/version.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/futils.cpp b/src/futils.cpp index 83964050..cc60cb35 100644 --- a/src/futils.cpp +++ b/src/futils.cpp @@ -463,7 +463,7 @@ namespace Exiv2 { std::string getProcessPath() { std::string ret("unknown"); - #if defined(WIN32) + #if defined(WIN32) || defined (__CYGWIN__) || defined(__MINGW__) HANDLE processHandle = NULL; processHandle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, GetCurrentProcessId()); if (processHandle != NULL) { diff --git a/src/version.cpp b/src/version.cpp index 44b6f06e..a2cc5cb8 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -42,6 +42,7 @@ #include "http.hpp" #include "version.hpp" #include "makernote_int.hpp" +#include "futils.hpp" // Adobe XMP Toolkit #ifdef EXV_HAVE_XMP_TOOLKIT @@ -451,6 +452,9 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys) output(os,keys,"version" , __VERSION__); output(os,keys,"date" , __DATE__ ); output(os,keys,"time" , __TIME__ ); + output(os,keys,"processpath" , Exiv2::getProcessPath()); + output(os,keys,"localedir" , EXV_LOCALEDIR); + output(os,keys,"package_name" , EXV_PACKAGE_NAME); #ifdef EXV_USE_CURL std::string curl_protocols;