projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56d3f5a
)
visual studio lrintf is very slow - do not use
author
Aaron Boxer
<boxerab@gmail.com>
Tue, 16 Jun 2015 00:17:01 +0000
(20:17 -0400)
committer
Antonin Descampe
<antonin@gmail.com>
Fri, 3 Jul 2015 13:22:42 +0000
(15:22 +0200)
src/lib/openjp2/opj_includes.h
patch
|
blob
|
history
diff --git
a/src/lib/openjp2/opj_includes.h
b/src/lib/openjp2/opj_includes.h
index e3d4686488c109b9153388c510c60af9f453160f..8fbe1a536d406d39cbc6789661aca8c59d22bce2 100644
(file)
--- a/
src/lib/openjp2/opj_includes.h
+++ b/
src/lib/openjp2/opj_includes.h
@@
-119,7
+119,7
@@
#endif
/* MSVC before 2013 and Borland C do not have lrintf */
-#if defined(_MSC_VER)
&& (_MSC_VER < 1800)
|| defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
static INLINE long lrintf(float f){
#ifdef _M_X64
return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));