From 52eb143b44c0580abd019cec76df3aa07bbf2c1c Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Fri, 5 Dec 2008 18:04:44 +0000 Subject: [PATCH] Changing some optimized assembly to standard C code to get openjpeg-dotnet compiling on 64-bit Windows git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2372 52acb1d6-8a22-11de-b505-999d5b087335 --- openjpeg-dotnet/libopenjpeg/opj_includes.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/openjpeg-dotnet/libopenjpeg/opj_includes.h b/openjpeg-dotnet/libopenjpeg/opj_includes.h index 4f78e9f7..7d89fc63 100644 --- a/openjpeg-dotnet/libopenjpeg/opj_includes.h +++ b/openjpeg-dotnet/libopenjpeg/opj_includes.h @@ -89,14 +89,7 @@ Most compilers implement their own version of this keyword ... /* MSVC does not have lrintf */ #ifdef _MSC_VER static INLINE long lrintf(float f){ - int i; - - _asm{ - fld f - fistp i - }; - - return i; + return (long)(f + (f > 0.0 ? + 0.5 : -0.5) ); } #endif