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

Patch to support the MSVC Win 64 builds (from szekerest)

This commit is contained in:
Antonin Descampe 2010-10-22 09:45:53 +00:00
parent 56dd722fb4
commit e36881487d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
October 22, 2010
* [antonin] Patch to support the MSVC Win 64 builds (from szekerest)
October 22, 2010 October 22, 2010
* [antonin] Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest) * [antonin] Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest)

4
libopenjpeg/opj_includes.h
View File

@ -89,6 +89,9 @@ Most compilers implement their own version of this keyword ...
/* MSVC and Borland C do not have lrintf */ /* MSVC and Borland C do not have lrintf */
#if defined(_MSC_VER) || defined(__BORLANDC__) #if defined(_MSC_VER) || defined(__BORLANDC__)
static INLINE long lrintf(float f){ static INLINE long lrintf(float f){
#ifdef _M_X64
return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
#else
int i; int i;
_asm{ _asm{
@ -97,6 +100,7 @@ static INLINE long lrintf(float f){
}; };
return i; return i;
#endif
} }
#endif #endif