diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-04-19 20:35:20 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-04-19 20:35:20 +0400 |
| commit | 7f154456293f49012643508c30f4b1fb40b3f2e5 (patch) | |
| tree | dc5700b8e3e40ca48bf1557b294b8c7ee6900005 /extern/libopenjpeg | |
| parent | 7dbc9dc719c3eb0823e4f9e7ae94a479f9427ea7 (diff) | |
Fix for libopenjpeg to enable win64 compile (is in their tracker and will most likely be included in next release)
Diffstat (limited to 'extern/libopenjpeg')
| -rw-r--r-- | extern/libopenjpeg/opj_includes.h | 7 |
1 files changed, 7 insertions, 0 deletions
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 <emmintrin.h> +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" |