walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix for c++ builder non windows compilers 

This fix is needed to compile with non windows c++ builder compilers
This commit is contained in:
erayhanoglu 2017-01-06 09:33:54 +02:00 committed by GitHub
parent 9fd532ac96
commit 2b962d5bd5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/openjp2/opj_includes.h
View File

@ -68,7 +68,8 @@
#endif #endif
#if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \ #if defined(WIN32) && !defined(Windows95) && !defined(
) && \
!(defined(_MSC_VER) && _MSC_VER < 1400) && \ !(defined(_MSC_VER) && _MSC_VER < 1400) && \
!(defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x800) !(defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x800)
/* /*
@ -153,7 +154,7 @@ static INLINE long opj_lrintf(float f){
return (long)((f>0.0f) ? (f + 0.5f) : (f - 0.5f)); return (long)((f>0.0f) ? (f + 0.5f) : (f - 0.5f));
#endif #endif
} }
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__) && defined(_WIN32)
static INLINE long opj_lrintf(float f) { static INLINE long opj_lrintf(float f) {
#ifdef _M_X64 #ifdef _M_X64
return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));