Merge pull request #656 from mleotta/dev/patch-vxl

Patch VXL for VS 2019 compile issue

Author: dstoup

Patches/VXL/Patch.cmake

@@ -6,3 +6,8 @@
 file(COPY ${VXL_PATCH_DIR}/core/vbl/vbl_array_2d.h
   DESTINATION ${VXL_SOURCE_DIR}/core/vbl/
 )
+
+# fixes an issue with duplicate definition of lrintf() on Windows
+file(COPY ${VXL_PATCH_DIR}/v3p/openjpeg2/opj_includes.h
+  DESTINATION ${VXL_SOURCE_DIR}/v3p/openjpeg2/
+)

Patches/VXL/v3p/openjpeg2/opj_includes.h

@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef OPJ_INCLUDES_H
+#define OPJ_INCLUDES_H
+
+/*
+ ==========================================================
+   Standard includes used by the library
+ ==========================================================
+*/
+#include <memory.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <float.h>
+#include <time.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <assert.h>
+
+/*
+ ==========================================================
+   OpenJPEG interface
+ ==========================================================
+ */
+
+/*
+ ==========================================================
+   OpenJPEG modules
+ ==========================================================
+*/
+
+/* Ignore GCC attributes if this is not GCC */
+#ifndef __GNUC__
+        #define __attribute__(x) /* __attribute__(x) */
+#endif
+
+/*
+The inline keyword is supported by C99 but not by C90.
+Most compilers implement their own version of this keyword ...
+*/
+#ifndef INLINE
+        #if defined(_MSC_VER)
+                #define INLINE __inline
+        #elif defined(__GNUC__)
+                #define INLINE __inline__
+        #else
+                /* add other compilers here ... */
+                #define INLINE
+        #endif /* defined(<Compiler>) */
+#endif /* INLINE */
+
+/* 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 does not have lrintf */
+#if defined(_MSC_VER)
+
+/* MSVC 64bits doesn't support _asm */
+#if !defined(_WIN64)
+static INLINE long lrintf(float f){
+        int i;
+
+        _asm{
+                fld f
+                fistp i
+        };
+
+  return i;
+}
+#endif
+
+#endif
+
+#endif /* OPJ_INCLUDES_H */