[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=88b3f77

The following commit has been merged in the master branch:
commit 88b3f7779666b17f865838ff1926f01dc5697d8d
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 22 20:52:02 2016 +0000

    #1074 Fix bug in TiffImage printStructure() for large icc profiles.
---
 src/actions.cpp        | 9 ++++++++-
 src/tiffimage.cpp      | 6 +++---
 test/data/icc-test.out | 6 ++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 0e74e5c..e337672 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -270,7 +270,14 @@ namespace Action {
         }
         Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(path_);
         assert(image.get() != 0);
-        image->printStructure(out,option);
+        if ( option == Exiv2::kpsIccProfile ) {
+            image->readMetadata();
+            if ( image->iccProfileDefined() ) {
+                out.write((const char*)image->iccProfile()->pData_,image->iccProfile()->size_);
+            }
+        } else {
+            image->printStructure(out,option);
+        }
         return 0;
     }
 
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 0877c6d..d442444 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -532,9 +532,9 @@ namespace Exiv2 {
                 std::string sp  = "" ; // output spacer
 
                 //prepare to print the value
-                uint16_t kount  = isPrintXMP(tag,option) ? count // restrict long arrays
-                                : isPrintICC(tag,option) ? count //
-                                : isStringType(type)     ? (count > 32 ? 32 : count)
+                uint32_t kount  = isPrintXMP(tag,option) ? count // haul in all the data
+                                : isPrintICC(tag,option) ? count // ditto
+                                : isStringType(type)     ? (count > 32 ? 32 : count) // restrict long arrays
                                 : count > 5              ? 5
                                 : count
                                 ;
diff --git a/test/data/icc-test.out b/test/data/icc-test.out
index 0fdd88f..fdb85de 100644
--- a/test/data/icc-test.out
+++ b/test/data/icc-test.out
@@ -766,11 +766,11 @@ STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
      346 | 0x8773 InterColorProfile         | UNDEFINED |      560 |      8880 | ...0ADBE....mntrRGB XYZ ....... ...
      358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
 END ReaganLargeTiff.tiff
-963add0d8be3d702528ac77902fbe738
+45ed3c125cc6041b37b44ee4cb881cd8
 45ed3c125cc6041b37b44ee4cb881cd8
 50b9125494306a6fc1b7c4f2a1a8d49d
 50b9125494306a6fc1b7c4f2a1a8d49d
-963add0d8be3d702528ac77902fbe738
+45ed3c125cc6041b37b44ee4cb881cd8
 45ed3c125cc6041b37b44ee4cb881cd8
 STRUCTURE OF JPEG FILE: ReaganLargeJpg.jpg
  address | marker       |  length | data
@@ -813,6 +813,8 @@ Error: XMP Toolkit error 203: Duplicate property or field node
 Warning: Failed to decode XMP metadata.
 Error: XMP Toolkit error 203: Duplicate property or field node
 Warning: Failed to decode XMP metadata.
+Error: XMP Toolkit error 203: Duplicate property or field node
+Warning: Failed to decode XMP metadata.
 STRUCTURE OF JPEG FILE: ReaganLargeJpg.jpg
  address | marker       |  length | data
        0 | 0xffd8 SOI  

-- 
exiv2 packaging