Merge branch 'master' of https://github.com/uclouvain/openjpeg into tier1_optimizatio...

[openjpeg.git] / src / lib / openjp2 / opj_includes.h

diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
index d0130028373be944835ddd988e4e2dc20a4f31e5..66323e946806f1b7ba1c2858d7540b665e49a2ea 100644 (file)
--- a/src/lib/openjp2/opj_includes.h
+++ b/src/lib/openjp2/opj_includes.h
@@ -102,34 +102,45 @@
  ==========================================================
 */
 
-/* Ignore GCC attributes if this is not GCC */
-#ifndef __GNUC__
-       #define __attribute__(x) /* __attribute__(x) */
-#endif
-
-
 /* Are restricted pointers available? (C99) */
-#if (__STDC_VERSION__ != 199901L)
+#if (__STDC_VERSION__ >= 199901L)
+  #define OPJ_RESTRICT restrict
+#else
        /* Not a C99 compiler */
-       #ifdef __GNUC__
-               #define restrict __restrict__
+       #if defined(__GNUC__)
+               #define OPJ_RESTRICT __restrict__
+
+/*
+  vc14 (2015) outputs wrong results.
+  Need to check OPJ_RESTRICT usage (or a bug in vc14)
+       #elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+               #define OPJ_RESTRICT __restrict
+*/
        #else
-               #define restrict /* restrict */
+               #define OPJ_RESTRICT /* restrict */
        #endif
 #endif
 
+#ifdef __has_attribute
+       #if __has_attribute(no_sanitize)
+               #define OPJ_NOSANITIZE(kind) __attribute__((no_sanitize(kind)))
+       #endif
+#endif
+#ifndef OPJ_NOSANITIZE
+       #define OPJ_NOSANITIZE(kind)
+#endif
 
 
 /* MSVC before 2013 and Borland C do not have lrintf */
 #if defined(_MSC_VER)
 #include <intrin.h>
-static INLINE long lrintf(float f){
+static INLINE long opj_lrintf(float f){
 #ifdef _M_X64
        return _mm_cvt_ss2si(_mm_load_ss(&f));
 
-       // commented out line breaks many tests
-    ///return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
-#else
+       /* commented out line breaks many tests */
+  /* return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); */
+#elif defined(_M_IX86)
     int i;
      _asm{
         fld f
@@ -137,12 +148,12 @@ static INLINE long lrintf(float f){
     };
  
     return i;
+#else 
+       return (long)((f>0.0f) ? (f + 0.5f) : (f - 0.5f));
 #endif
 }
-#endif
-
-#if  defined(__BORLANDC__)
-static INLINE long lrintf(float f) {
+#elif defined(__BORLANDC__)
+static INLINE long opj_lrintf(float f) {
 #ifdef _M_X64
      return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
 #else
@@ -156,22 +167,33 @@ static INLINE long lrintf(float f) {
        return i;
 #endif
 }
+#else
+static INLINE long opj_lrintf(float f) {
+       return lrintf(f);
+}
 #endif
 
-
-
 #if defined(_MSC_VER) && (_MSC_VER < 1400)
        #define vsnprintf _vsnprintf
 #endif
 
+/* MSVC x86 is really bad at doing int64 = int32 * int32 on its own. Use intrinsic. */
+#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86)
+#      include <intrin.h>
+#      pragma intrinsic(__emul)
+#endif
+
 #include "opj_inttypes.h"
 #include "opj_clock.h"
 #include "opj_malloc.h"
-#include "function_list.h"
 #include "event.h"
+#include "function_list.h"
 #include "bio.h"
 #include "cio.h"
 
+#include "thread.h"
+#include "tls_keys.h"
+
 #include "image.h"
 #include "invert.h"
 #include "j2k.h"