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

The following commit has been merged in the master branch:
commit bc1abeac2642ed704a93b3e02f06ff788f29cb99
Author: Robin Mills <robin at clanmills.com>
Date:   Mon May 2 20:51:59 2016 +0000

    #1108 Discovered another embedded tiff tag SubIFDs
---
 src/tiffimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 2f2b063..69d31ca 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -569,7 +569,7 @@ namespace Exiv2 {
 
                     sp = kount == count ? "" : " ...";
                     out << sp << std::endl;
-                    if ( option == kpsRecursive && tag == 0x8769 /* ExifTag */ ) {
+                    if ( option == kpsRecursive && (tag == 0x8769 /* ExifTag */ || tag == 0x014a/*SubIFDs*/ ) ) {
                         size_t restore = io.tell();
                         printIFDStructure(io,out,option,Offset,bSwap,c,depth);
                         io.seek(restore,BasicIo::beg);

-- 
exiv2 packaging