patch to remove lrintf() definition for _WIN64

Author: mleotta

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

@@ -100,21 +100,6 @@ static INLINE long lrintf(float f){
 
   return i;
 }
-#else
-static INLINE long lrintf(float x){
-  long r;
-  if (x>=0.f)
-  {
-     x+=0.5f;
-  }
-  else
-  {
-     x-=0.5f;
-  }
-  r = (long)(x);
-  if ( x != (float)(r) ) return r;
-  return 2*(r/2);
-}
 #endif
 
 #endif