Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/opj_intmath.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) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
@@ skipping 69 matching lines @@
 static INLINE OPJ_UINT32 opj_uint_max(OPJ_UINT32  a, OPJ_UINT32  b) {
         return (a > b) ? a : b;
 }
 
 /**
  Get the saturated sum of two unsigned integers
  @return Returns saturated sum of a+b
  */
 static INLINE OPJ_UINT32 opj_uint_adds(OPJ_UINT32 a, OPJ_UINT32 b) {
         OPJ_UINT64 sum = (OPJ_UINT64)a + (OPJ_UINT64)b;
-        return -(OPJ_UINT32)(sum >> 32) | (OPJ_UINT32)sum;
+        return (OPJ_UINT32)(-(OPJ_INT32)(sum >> 32)) | (OPJ_UINT32)sum;
 }
 
 /**
 Clamp an integer inside an interval
 @return
 <ul>
 <li>Returns a if (min < a < max)
 <li>Returns max if (a > max)
 <li>Returns min if (a < min) 
 </ul>
@@ skipping 27 matching lines @@
 static INLINE OPJ_UINT32  opj_uint_ceildiv(OPJ_UINT32  a, OPJ_UINT32  b) {
         assert(b);
         return (a + b - 1) / b;
 }
 
 /**
 Divide an integer by a power of 2 and round upwards
 @return Returns a divided by 2^b
 */
 static INLINE OPJ_INT32 opj_int_ceildivpow2(OPJ_INT32 a, OPJ_INT32 b) {
-        return (OPJ_INT32)((a + (OPJ_INT64)(1 << b) - 1) >> b);
+        return (OPJ_INT32)((a + ((OPJ_INT64)1 << b) - 1) >> b);
 }
+
+/**
+ Divide a 64bits integer by a power of 2 and round upwards
+ @return Returns a divided by 2^b
+ */
+static INLINE OPJ_INT32 opj_int64_ceildivpow2(OPJ_INT64 a, OPJ_INT32 b) {
+        return (OPJ_INT32)((a + ((OPJ_INT64)1 << b) - 1) >> b);
+}
+
+/**
+ Divide an integer by a power of 2 and round upwards
+ @return Returns a divided by 2^b
+ */
+static INLINE OPJ_UINT32 opj_uint_ceildivpow2(OPJ_UINT32 a, OPJ_UINT32 b) {
+        return (OPJ_UINT32)((a + ((OPJ_UINT64)1U << b) - 1U) >> b);
+}
+
 /**
 Divide an integer by a power of 2 and round downwards
 @return Returns a divided by 2^b
 */
 static INLINE OPJ_INT32 opj_int_floordivpow2(OPJ_INT32 a, OPJ_INT32 b) {
         return a >> b;
 }
 /**
 Get logarithm of an integer and round downwards
 @return Returns log2(a)
@@ skipping 18 matching lines @@
         return l;
 }
 
 /**
 Multiply two fixed-precision rational numbers.
 @param a
 @param b
 @return Returns a * b
 */
 static INLINE OPJ_INT32 opj_int_fix_mul(OPJ_INT32 a, OPJ_INT32 b) {
+#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86)
+        OPJ_INT64 temp = __emul(a, b);
+#else
         OPJ_INT64 temp = (OPJ_INT64) a * (OPJ_INT64) b ;
+#endif
         temp += 4096;
         assert((temp >> 13) <= (OPJ_INT64)0x7FFFFFFF);
         assert((temp >> 13) >= (-(OPJ_INT64)0x7FFFFFFF - (OPJ_INT64)1));
         return (OPJ_INT32) (temp >> 13);
 }
 
 static INLINE OPJ_INT32 opj_int_fix_mul_t1(OPJ_INT32 a, OPJ_INT32 b) {
+#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86)
+        OPJ_INT64 temp = __emul(a, b);
+#else
         OPJ_INT64 temp = (OPJ_INT64) a * (OPJ_INT64) b ;
+#endif
         temp += 4096;
         assert((temp >> (13 + 11 - T1_NMSEDEC_FRACBITS)) <= (OPJ_INT64)0x7FFFFFFF);
         assert((temp >> (13 + 11 - T1_NMSEDEC_FRACBITS)) >= (-(OPJ_INT64)0x7FFFFFFF - (OPJ_INT64)1));
         return (OPJ_INT32) (temp >> (13 + 11 - T1_NMSEDEC_FRACBITS)) ;
 }
 
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
 /*@}*/
 
 #endif