From 07e2ddda3f8a099918c6193332764cd1de28da89 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 7 Oct 2014 23:12:20 +0200
Subject: [PATCH] More preparations to update to KDU 7.5.0.

---
 indra/llkdu/llimagej2ckdu.h | 7 +++++++
 indra/llkdu/llkdumem.h      | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 5dce783945..06bbcf66d0 100755
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -33,6 +33,13 @@
 // KDU core header files
 //
 #define KDU_NO_THREADS
+
+// <FS:ND> Some magic to make KDU and the viewer agree with internal alignments
+#if KDU_MAJOR_VERSION >= 7 && KDU_MINOR_VERSION >= 5
+ #define KDU_X86_INTRINSICS
+#endif
+// </FS:ND>
+
 #include "kdu_elementary.h"
 #include "kdu_messaging.h"
 #include "kdu_params.h"
diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h
index 6977013643..b2c95acccc 100755
--- a/indra/llkdu/llkdumem.h
+++ b/indra/llkdu/llkdumem.h
@@ -38,7 +38,14 @@
 // </FS:ND>
 
 // Support classes for reading and writing from memory buffers in KDU
-#define KDU_NO_THREADS
+#define KDU_NO_THREAD
+
+// <FS:ND> Some magic to make KDU and the viewer agree with internal alignments
+#if KDU_MAJOR_VERSION >= 7 && KDU_MINOR_VERSION >= 5
+ #define KDU_X86_INTRINSICS
+#endif
+// </FS:ND>
+
 #include "kdu_image.h"
 #include "kdu_elementary.h"
 #include "kdu_messaging.h"