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

The following commit has been merged in the master branch:
commit f2ec4ce36adb3f233e3b39df1f7a49fad8f1104c
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 15 12:20:51 2016 +0000

    #1074 Work in progress.  fixed pngimage.cpp doWriteMetadata().
---
 src/actions.cpp                                   |   2 +-
 src/pngchunk.cpp                                  |  15 ---
 src/pngchunk_int.hpp                              |  11 --
 src/pngimage.cpp                                  |  59 +++++++---
 test/data/{ReaganSmall.png => ReaganSmallPng.png} | Bin
 test/data/bugfixes-test.out                       | Bin 1912453 -> 1912453 bytes
 test/data/icc-test.out                            | 128 +++++-----------------
 test/data/small.icc                               | Bin 3142 -> 560 bytes
 8 files changed, 73 insertions(+), 142 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 0958b1a..873f6b0 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1187,7 +1187,7 @@ namespace Action {
                 std::cerr << _("No embedded iccProfile: ") << path_ << std::endl;
                 rc = -2;
             } else {
-                
+
                 if ( Params::instance().target_ & Params::ctStdInOut ) { // -eC-
                     std::cout.write((const char*)image->iccProfile()->pData_,image->iccProfile()->size_);
                 } else {
diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 14638fd..a87e03c 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -541,21 +541,6 @@ namespace Exiv2 {
 
     } // PngChunk::makeAsciiTxtChunk
 
-    std::string PngChunk::makeICCPChunkHeader(const std::string& keyword,long compressedLength)
-    {
-        // Chunk structure: length (4 bytes) + chunk type
-        std::string chunkData = keyword + '

-- 
exiv2 packaging