[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=178d0f5

The following commit has been merged in the master branch:
commit 178d0f5fc6aa65557d13995e358b7751744eb4c6
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Jan 8 12:24:23 2016 +0000

    #1148.  Fixed formatting error in jpgimage/-pS code.
---
 src/jpgimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 83e5966..244ce4f 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -517,7 +517,7 @@ namespace Exiv2 {
         return true ;
     }
 
-#define REPORT_MARKER if ( (option == kpsBasic||option == kpsRecursive) ) out << Internal::stringFormat("%8ld | %#02x %-5s",io_->tell(), marker,nm[marker].c_str())
+#define REPORT_MARKER if ( (option == kpsBasic||option == kpsRecursive) ) out << Internal::stringFormat("%8ld | %#04x %-5s",io_->tell(), marker,nm[marker].c_str())
 
     void JpegBase::printStructure(std::ostream& out, PrintStructureOption option,int depth)
     {

-- 
exiv2 packaging