[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=512cd43

The following commit has been merged in the master branch:
commit 512cd43e0bfd5d47ab54157c7a040826de07e49c
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Aug 10 19:13:13 2016 +0000

    #1199 WebPImage::printStructure() refactored to match implentation style of other image handlers.
---
 src/webpimage.cpp | 117 +++++++++++++++++-------------------------------------
 1 file changed, 37 insertions(+), 80 deletions(-)

diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 46f6f92..e66ef77 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -33,6 +33,7 @@
 #include "config.h"
 
 #include "webpimage.hpp"
+#include "image_int.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"
 #include "tags.hpp"
@@ -345,100 +346,56 @@ namespace Exiv2 {
 
     void WebPImage::printStructure(std::ostream& out, PrintStructureOption option,int depth)
     {
-        if (io_->open() != 0) {
-            throw Error(9, io_->path(), strError());
-        }
+        if (io_->open() != 0) throw Error(9, io_->path(), strError());
         IoCloser closer(*io_);
-        // Ensure that this is the correct image type
+        // Ensure this is the correct image type
         if (!isWebPType(*io_, true)) {
             if (io_->error() || io_->eof()) throw Error(14);
             throw Error(3, "WEBP");
         }
 
-        if ( option == kpsBasic || option == kpsXMP ) {
-
-            char output[255];
-            char showdata[16];
-            byte header[12];
-            byte size_buff[4];
-            DataBuf chunkId(5);
-            uint64_t offset = 0;
-            int length = 0;
-            const int TAG_SIZE = 4;
-            chunkId.pData_[4] = '

-- 
exiv2 packaging