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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:46:18 UTC 2017


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

The following commit has been merged in the master branch:
commit 1f9de360a715f8210189282076009914b198fc8a
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Mar 5 23:29:27 2016 +0000

    Fixed formatting issue in -pS/-pR output.
---
 src/tiffimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index b56c663..324266a 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -499,7 +499,7 @@ namespace Exiv2 {
                 if ( bFirst && bPrint ) {
                     out << indent(depth)
                         << " address |    tag                           |     "
-                        << " type |    count |   offset | value
";
+                        << " type |    count |    offset | value
";
                 }
                 bFirst = false;
 
@@ -541,7 +541,7 @@ namespace Exiv2 {
                 if ( bPrint ) {
                     uint32_t address = start + 2 + i*12 ;
                     out << indent(depth)
-                            << Internal::stringFormat("%8u | %#06x %-25s |%10s |%9u |%9u | "
+                            << Internal::stringFormat("%8u | %#06x %-25s |%10s |%9u |%10u | "
                                 ,address,tag,tagName(tag,25),typeName(type),count,offset);
                     if ( isShortType(type) ){
                         for ( uint16_t k = 0 ; k < kount ; k++ ) {

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list