[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19791] trunk/blender/extern/libopenjpeg/ opj_includes.h: Fix for libopenjpeg to enable win64 compile ( is in their tracker and will most likely be included in next release)

Daniel Genrich daniel.genrich at gmx.net
Sun Apr 19 18:35:20 CEST 2009


Revision: 19791
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19791
Author:   genscher
Date:     2009-04-19 18:35:20 +0200 (Sun, 19 Apr 2009)

Log Message:
-----------
Fix for libopenjpeg to enable win64 compile (is in their tracker and will most likely be included in next release)

Modified Paths:
--------------
    trunk/blender/extern/libopenjpeg/opj_includes.h

Modified: trunk/blender/extern/libopenjpeg/opj_includes.h
===================================================================
--- trunk/blender/extern/libopenjpeg/opj_includes.h	2009-04-19 14:57:52 UTC (rev 19790)
+++ trunk/blender/extern/libopenjpeg/opj_includes.h	2009-04-19 16:35:20 UTC (rev 19791)
@@ -88,6 +88,12 @@
 
 /* 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 @@
 	return i;
 }
 #endif
+#endif
 
 #include "j2k_lib.h"
 #include "opj_malloc.h"





More information about the Bf-blender-cvs mailing list