Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/opj_malloc.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) 2007, Callum Lerwick <seg@haxxed.com>
  * All rights reserved.
  *
@@ skipping 61 matching lines @@
 #else
 /* prevent assertion on overflow for MSVC */
 #ifdef _MSC_VER
 #define opj_calloc(num, size) ((size_t)(num) != 0 && (size_t)(num) >= (size_t)-0x100 / (size_t)(size) ? NULL : calloc(num, size))
 #else
 #define opj_calloc(num, size) calloc(num, size)
 #endif
 #endif
 
 /**
-Allocate memory aligned to a 16 byte boundry
+Allocate memory aligned to a 16 byte boundary
 @param size Bytes to allocate
 @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
 */
 /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
 #ifdef _WIN32
         /* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
         #ifdef __GNUC__
                 #include <mm_malloc.h>
                 #define HAVE_MM_MALLOC
         #else /* MSVC, Intel C++ */
@@ skipping 83 matching lines @@
 #pragma GCC poison malloc calloc realloc free
 #endif
 
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
 /*@}*/
 
 #endif /* __OPJ_MALLOC_H */