From 2ae0bcf7b89cc1b8cf69e3282d7ad59bd5498d0e Mon Sep 17 00:00:00 2001 From: vog Date: Mon, 22 Aug 2011 21:56:49 +0000 Subject: [PATCH] Added version hex number to the output of "exiv2 -V" --- src/exiv2.cpp | 4 ++-- test/data/exiv2-test.out | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/exiv2.cpp b/src/exiv2.cpp index 558195cc..2d03d1f3 100644 --- a/src/exiv2.cpp +++ b/src/exiv2.cpp @@ -206,8 +206,8 @@ void Params::cleanup() void Params::version(std::ostream& os) const { bool b64 = sizeof(void*)==8; - const char* sBuild = b64 ? " (64 bit build)" : " (32 bit build)" ; - os << EXV_PACKAGE_STRING << sBuild << "\n" + const char* sBuild = b64 ? "(64 bit build)" : "(32 bit build)" ; + os << EXV_PACKAGE_STRING << " " << Exiv2::versionNumberHexString() << " " << sBuild << "\n" << _("Copyright (C) 2004-2011 Andreas Huggel.\n") << "\n" << _("This program is free software; you can redistribute it and/or\n" diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 5f478f40..eb23bb66 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -2,7 +2,7 @@ Exiv2 test directory ----------------------------------------------------- tmp/ Exiv2 version ------------------------------------------------------------ -exiv2 0.21.1 (__ bit build) +exiv2 0.21.1 001501 (__ bit build) Copyright (C) 2004-2011 Andreas Huggel. This program is free software; you can redistribute it and/or