diff -r -u OpenJPEG_v1_3-original\libopenjpeg\opj_includes.h OpenJPEG_v1_3\libopenjpeg\opj_includes.h --- OpenJPEG_v1_3-original\libopenjpeg\opj_includes.h Tue Nov 13 19:35:12 2007 +++ OpenJPEG_v1_3\libopenjpeg\opj_includes.h Fri May 16 11:38:13 2008 @@ -88,17 +88,24 @@ /* MSVC does not have lrintf */ #ifdef _MSC_VER -static INLINE long lrintf(float f){ - int i; + #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; - _asm{ - fld f - fistp i - }; + _asm{ + fld f + fistp i + }; - return i; -} -#endif + return i; + } + #endif // _M_X64 +#endif // _MSC_VER #include "j2k_lib.h" #include "opj_malloc.h"