[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=541dfe8

The following commit has been merged in the master branch:
commit 541dfe8fdf8f021290ae1ad24dd437c5c379a2d6
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Aug 10 17:39:18 2016 +0000

    #1199  Thank you to Ben for the patch.  This corrects various matters and adds a first stab at WebPImage::printStructure()
---
 include/exiv2/webpimage.hpp |   4 +
 src/webpimage.cpp           | 396 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 352 insertions(+), 48 deletions(-)

diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp
index 652384f..a2f59cd 100644
--- a/include/exiv2/webpimage.hpp
+++ b/include/exiv2/webpimage.hpp
@@ -73,6 +73,7 @@ namespace Exiv2 {
         //@{
         void readMetadata();
         void writeMetadata();
+        void printStructure(std::ostream& out, PrintStructureOption option,int depth);
         //@}
 
         /*!
@@ -92,6 +93,9 @@ namespace Exiv2 {
         //@{
         bool equalsWebPTag(Exiv2::DataBuf& buf ,const char* str);
         void decodeChunks(uint64_t filesize);
+        void inject_VP8X(BasicIo& iIo, bool has_xmp, bool has_exif,
+                         bool has_alpha, bool has_icc);
+
         //! Copy constructor
         WebPImage(const WebPImage& rhs);
         //! Assignment operator
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index c5bddac..46f6f92 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -22,7 +22,7 @@
   File:      webpimage.cpp
   Version:   $Rev: 3845 $
   Author(s): Ben Touchette <draekko.software+exiv2 at gmail.com>
-  History:   29-Jul-16
+  History:   10-Aug-16
   Credits:   See header file
  */
 // *****************************************************************************
@@ -54,6 +54,7 @@
 
 #define CHECK_BIT(var,pos) ((var) & (1<<(pos)))
 
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
@@ -114,11 +115,11 @@ namespace Exiv2 {
         byte data[12];
         DataBuf chunkId(5);
         const int TAG_SIZE = 4;
-        chunkId.pData_[4] = '

-- 
exiv2 packaging