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

The following commit has been merged in the master branch:
commit c858b7d44e182763c1788e83d53a322d92607907
Author: draekko <draekko.software at gmail.com>
Date:   Sat Aug 20 12:42:24 2016 +0000

    #1199 minor code update, updated comments, added constants for headers, bit definitions, and misc.
---
 include/exiv2/webpimage.hpp |  16 ++-
 src/webpimage.cpp           | 247 ++++++++++++++++++++++++--------------------
 2 files changed, 150 insertions(+), 113 deletions(-)

diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp
index 093cf72..ebd4c42 100644
--- a/include/exiv2/webpimage.hpp
+++ b/include/exiv2/webpimage.hpp
@@ -107,8 +107,20 @@ namespace Exiv2 {
         //@}
 
     private:
-        int streamType_;
-        const int TAG_SIZE;
+        const static byte WEBP_PAD_ODD;
+        const static int WEBP_TAG_SIZE;
+        const static int WEBP_VP8X_ICC_BIT;
+        const static int WEBP_VP8X_ALPHA_BIT;
+        const static int WEBP_VP8X_EXIF_BIT;
+        const static int WEBP_VP8X_XMP_BIT;
+        const static char* WEBP_CHUNK_HEADER_VP8X;
+        const static char* WEBP_CHUNK_HEADER_VP8L;
+        const static char* WEBP_CHUNK_HEADER_VP8;
+        const static char* WEBP_CHUNK_HEADER_ANMF;
+        const static char* WEBP_CHUNK_HEADER_ANIM;
+        const static char* WEBP_CHUNK_HEADER_ICCP;
+        const static char* WEBP_CHUNK_HEADER_EXIF;
+        const static char* WEBP_CHUNK_HEADER_XMP;
 
 
     }; //Class WebPImage
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 19c695a..b5b5ff3 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -25,6 +25,11 @@
  History:   10-Aug-16
  Credits:   See header file
  */
+/*
+  Google's WEBP container spec can be found at the link below:
+  https://developers.google.com/speed/webp/docs/riff_container
+*/
+
 // *****************************************************************************
 #include "rcsid_int.hpp"
 
@@ -65,7 +70,6 @@ namespace Exiv2 {
 
     WebPImage::WebPImage(BasicIo::AutoPtr io)
     : Image(ImageType::webp, mdNone, io)
-    , TAG_SIZE(4)
     {
     } // WebPImage::WebPImage
 
@@ -76,6 +80,28 @@ namespace Exiv2 {
 
     /* =========================================== */
 
+    /* Misc. */
+    const byte WebPImage::WEBP_PAD_ODD = 0;
+    const int WebPImage::WEBP_TAG_SIZE = 0x4;
+
+    /* VP8X feature flags */
+    const int WebPImage::WEBP_VP8X_ICC_BIT = 0x20;
+    const int WebPImage::WEBP_VP8X_ALPHA_BIT = 0x10;
+    const int WebPImage::WEBP_VP8X_EXIF_BIT = 0x8;
+    const int WebPImage::WEBP_VP8X_XMP_BIT = 0x4;
+
+    /* Chunk header names */
+    const char* WebPImage::WEBP_CHUNK_HEADER_VP8X = "VP8X";
+    const char* WebPImage::WEBP_CHUNK_HEADER_VP8L = "VP8L";
+    const char* WebPImage::WEBP_CHUNK_HEADER_VP8  = "VP8 ";
+    const char* WebPImage::WEBP_CHUNK_HEADER_ANMF = "ANMF";
+    const char* WebPImage::WEBP_CHUNK_HEADER_ANIM = "ANIM";
+    const char* WebPImage::WEBP_CHUNK_HEADER_ICCP = "ICCP";
+    const char* WebPImage::WEBP_CHUNK_HEADER_EXIF = "EXIF";
+    const char* WebPImage::WEBP_CHUNK_HEADER_XMP  = "XMP ";
+
+    /* =========================================== */
+
     void WebPImage::setIptcData(const IptcData& /*iptcData*/)
     {
         // not supported
@@ -114,15 +140,15 @@ namespace Exiv2 {
         std::cout << "Writing metadata" << std::endl;
 #endif
 
-        byte    data   [TAG_SIZE*3];
-        DataBuf chunkId(TAG_SIZE+1);
-        chunkId.pData_ [TAG_SIZE] = '

-- 
exiv2 packaging