Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-20 11:36:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-20 11:36:58 +0300
commit75c9fe428fa8ed1dec093de6a7b2dc6ca042f6d6 (patch)
tree7c7c2ea8da401497a63fa7f66cdbe6756b039958 /extern/libopenjpeg/opj_includes.h
parent81a477f4dc999918ba66413a286f5a0b1c0c4e79 (diff)
Update bundled openjpeg from 1.5.0 to 1.5.2
Solves following issues: - Quite reasonable amount of paranoid warnings were solved by an upstream - Upstream seems to have all fixes needed for FreeBSD and OSX already - Brings all fixes and such from upstream
Diffstat (limited to 'extern/libopenjpeg/opj_includes.h')
-rw-r--r--extern/libopenjpeg/opj_includes.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/extern/libopenjpeg/opj_includes.h b/extern/libopenjpeg/opj_includes.h
index 2b5866a9990..e9194fd9886 100644
--- a/extern/libopenjpeg/opj_includes.h
+++ b/extern/libopenjpeg/opj_includes.h
@@ -89,18 +89,17 @@ Most compilers implement their own version of this keyword ...
/* MSVC and Borland C do not have lrintf */
#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));
-#else
- int i;
+#ifdef _M_IX86
+ long int i;
_asm{
fld f
fistp i
};
-
return i;
-#endif
+#else
+ return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
+#endif /* _M_IX86 */
}
#endif