[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=92659f2

The following commit has been merged in the master branch:
commit 92659f24c8faa5ae9d5a0ddd8b5093f53670c7e0
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Oct 21 19:24:48 2016 +0000

    #1247 Restrict clang pragma to __APPLE__
---
 src/jp2image.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 40d28d5..9a94a23 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -598,8 +598,12 @@ namespace Exiv2
 
     } // Jp2Image::writeMetadata
 
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wcast-align"
+#ifdef __APPLE__
+// ignore cast align errors.  dataBuf.pData_ is allocated by malloc() and 4 (or 8 byte aligned).
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-align"
+#endif
+
     void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf)
     {
         DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space
@@ -668,7 +672,10 @@ namespace Exiv2
         ul2Data((byte*)&pBox->type,kJp2BoxTypeJp2Header,bigEndian);
         ul2Data((byte*)&pBox->length,outlen,bigEndian);
     } // Jp2Image::encodeJp2Header
-#   pragma clang diagnostic pop
+
+#ifdef __APPLE__
+#pragma clang diagnostic pop
+#endif
 
     void Jp2Image::doWriteMetadata(BasicIo& outIo)
     {

-- 
exiv2 packaging