Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/opj_includes.h

 /*
  * The copyright in this software is being made available under the 2-clauses 
  * BSD License, included below. This software may be subject to other third 
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR 
  * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
@@ skipping 100 matching lines @@
 /* Are restricted pointers available? (C99) */
 #if (__STDC_VERSION__ != 199901L)
         /* Not a C99 compiler */
         #ifdef __GNUC__
                 #define restrict __restrict__
         #else
                 #define restrict /* restrict */
         #endif
 #endif
 
+
+
 /* MSVC before 2013 and Borland C do not have lrintf */
-#if defined(_MSC_VER) && (_MSC_VER < 1800) || defined(__BORLANDC__)
-static INLINE long lrintf(float f){
+#if defined(_MSC_VER)
+#include <intrin.h>
+static INLINE long opj_lrintf(float f){
 #ifdef _M_X64
-    return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
-#else
+        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)); */
+#elif defined(_M_IX86)
     int i;
- 
-    _asm{
+     _asm{
         fld f
         fistp i
     };
  
     return i;
+#else 
+        return (long)((f>0.0f) ? (f + 0.5f) : (f - 0.5f));
 #endif
 }
+#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
+        int i;
+
+        _asm {
+                fld f
+                        fistp i
+        };
+
+        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 "event.h"
 #include "function_list.h"
-#include "event.h"
 #include "bio.h"
 #include "cio.h"
 
 #include "image.h"
 #include "invert.h"
 #include "j2k.h"
 #include "jp2.h"
 
 #include "mqc.h"
 #include "raw.h"
@@ skipping 17 matching lines @@
 #ifdef USE_JPWL
 #include "openjpwl/jpwl.h"
 #endif /* USE_JPWL */
 /* <<JPWL */
 
 /* V2 */
 #include "opj_codec.h"
 
 
 #endif /* OPJ_INCLUDES_H */