[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:47:16 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=dd0a228

The following commit has been merged in the master branch:
commit dd0a22814cbe72c50eea0b60ce215d61be4179bf
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Oct 31 18:42:32 2016 +0000

    #1247 Another correction to r4655 concerning clang/apple.
---
 src/jp2image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 5c7adf3..0b1ed49 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -598,7 +598,7 @@ namespace Exiv2
 
     } // Jp2Image::writeMetadata
 
-#ifdef __APPLE__
+#ifdef __clang__
 // 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"

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list