diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-07-26 02:41:39 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-07-26 02:41:39 +0200 |
| commit | c423cc84e7be79051a7f9631fa26aa7d072361f2 (patch) | |
| tree | 98d92f8501df77e5510c69eb4db6f1fab20b9855 /src/lib/openjp2/opj_includes.h | |
| parent | d87de3a88da9a405a06e8d1e3b3d5d8b3e935ba2 (diff) | |
Remove some warnings when building
Update #442
Diffstat (limited to 'src/lib/openjp2/opj_includes.h')
| -rw-r--r-- | src/lib/openjp2/opj_includes.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h index d8faede0..0d8c1ff3 100644 --- a/src/lib/openjp2/opj_includes.h +++ b/src/lib/openjp2/opj_includes.h @@ -123,7 +123,7 @@ /* MSVC before 2013 and Borland C do not have lrintf */ #if defined(_MSC_VER) #include <intrin.h> -static INLINE long lrintf(float f){ +static INLINE long opj_lrintf(float f){ #ifdef _M_X64 return _mm_cvt_ss2si(_mm_load_ss(&f)); @@ -139,10 +139,8 @@ static INLINE long lrintf(float f){ return i; #endif } -#endif - -#if defined(__BORLANDC__) -static INLINE long lrintf(float f) { +#elif defined(__BORLANDC__) +static INLINE long opj_lrintf(float f) { #ifdef _M_X64 return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); #else @@ -156,6 +154,10 @@ static INLINE long lrintf(float f) { return i; #endif } +#else +static INLINE long opj_lrintf(float f) { + return lrintf(f); +} #endif |