[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=fe6c71d

The following commit has been merged in the master branch:
commit fe6c71d0fa0d4a0f0e80d8b6d9b9893e87207941
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Dec 4 12:18:43 2016 +0000

    #1108 exiv2 -pR to dump type == tiffIfd
---
 src/image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/image.cpp b/src/image.cpp
index 01b6db7..70f90d2 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -426,7 +426,7 @@ namespace Exiv2 {
                     sp = kount == count ? "" : " ...";
                     out << sp << std::endl;
 
-                    if ( option == kpsRecursive && (tag == 0x8769 /* ExifTag */ || tag == 0x014a/*SubIFDs*/ ) ) {
+                    if ( option == kpsRecursive && (tag == 0x8769 /* ExifTag */ || tag == 0x014a/*SubIFDs*/  || type == tiffIfd) ) {
                         for ( size_t k = 0 ; k < count ; k++ ) {
                             size_t   restore = io.tell();
                             uint32_t offset = byteSwap4(buf,k*size,bSwap);

-- 
exiv2 packaging