[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=4abb560

The following commit has been merged in the master branch:
commit 4abb560cf7fd8afc528986c8ba86308524a1534c
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Oct 21 19:20:32 2016 +0000

    #1243.  Fixing compilation warnings from clang in jp2image.cpp
---
 src/jp2image.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 72277fa..40d28d5 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -598,12 +598,13 @@ namespace Exiv2
 
     } // Jp2Image::writeMetadata
 
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wcast-align"
     void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf)
     {
         DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space
         int     outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output?
         int      inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf?
-
         Jp2BoxHeader* pBox   = (Jp2BoxHeader*) boxBuf.pData_;
         int32_t       length = getLong((byte*)&pBox->length, bigEndian);
         int32_t       count  = sizeof (Jp2BoxHeader);
@@ -667,6 +668,7 @@ namespace Exiv2
         ul2Data((byte*)&pBox->type,kJp2BoxTypeJp2Header,bigEndian);
         ul2Data((byte*)&pBox->length,outlen,bigEndian);
     } // Jp2Image::encodeJp2Header
+#   pragma clang diagnostic pop
 
     void Jp2Image::doWriteMetadata(BasicIo& outIo)
     {

-- 
exiv2 packaging