From 7f154456293f49012643508c30f4b1fb40b3f2e5 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Sun, 19 Apr 2009 16:35:20 +0000 Subject: Fix for libopenjpeg to enable win64 compile (is in their tracker and will most likely be included in next release) --- extern/libopenjpeg/opj_includes.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'extern') diff --git a/extern/libopenjpeg/opj_includes.h b/extern/libopenjpeg/opj_includes.h index 80d43df990f..3464cfcf9ed 100644 --- a/extern/libopenjpeg/opj_includes.h +++ b/extern/libopenjpeg/opj_includes.h @@ -88,6 +88,12 @@ Most compilers implement their own version of this keyword ... /* MSVC does not have lrintf */ #ifdef _MSC_VER +#ifdef _M_X64 +#include +static INLINE long lrintf(float f) { + return _mm_cvtss_si32(_mm_load_ss(&f)); +} +#else static INLINE long lrintf(float f){ int i; @@ -99,6 +105,7 @@ static INLINE long lrintf(float f){ return i; } #endif +#endif #include "j2k_lib.h" #include "opj_malloc.h" -- cgit v1.2.3