diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-10-06 02:44:33 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-10-06 02:44:33 (GMT) |
| commit | ffc9e365d88138400360e31244a1dc4c00f494cc (patch) | |
| tree | f43d5bdddf8ec07f5a0c7669769f3446be642767 | |
| parent | ae19647c46fffa8f89c1e6d1756dbd5762ca418b (diff) | |
| parent | a5a5ee1fd1b3b034534d1ac558abb770294fbcb6 (diff) | |
| download | mxe-ffc9e365d88138400360e31244a1dc4c00f494cc.zip mxe-ffc9e365d88138400360e31244a1dc4c00f494cc.tar.gz mxe-ffc9e365d88138400360e31244a1dc4c00f494cc.tar.bz2 | |
Merge pull request #907 from saiarcot895/upstream-fix-openexr-64-bit
Add patch to openexr to fix pointer conversion.
| -rw-r--r-- | src/openexr-2-64-bit-fixes.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/openexr-2-64-bit-fixes.patch b/src/openexr-2-64-bit-fixes.patch new file mode 100644 index 0000000..e3667f5 --- /dev/null +++ b/src/openexr-2-64-bit-fixes.patch @@ -0,0 +1,27 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 317282de70ea0720fcba5339a573f3bd811ff74c Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 5 Oct 2015 21:16:35 -0400 +Subject: [PATCH] Correct pointer conversion. + + +diff --git a/IlmImf/ImfOptimizedPixelReading.h b/IlmImf/ImfOptimizedPixelReading.h +index 1c83497..65b0879 100644 +--- a/IlmImf/ImfOptimizedPixelReading.h ++++ b/IlmImf/ImfOptimizedPixelReading.h +@@ -70,7 +70,7 @@ EXR_FORCEINLINE + bool + isPointerSSEAligned (const void* EXR_RESTRICT pPointer) + { +- unsigned long trailingBits = ((unsigned long)pPointer) & 15; ++ uintptr_t trailingBits = ((uintptr_t)pPointer) & 15; + return trailingBits == 0; + } + +-- +2.1.4 + |