mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed glm::isinf and glm::isnan for with Android NDK 9d #191

Browse Source
This commit is contained in:
Christophe Riccio 2014-05-05 23:08:49 +02:00
parent a2b70690c1
commit e04ded9e39
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/detail/func_common.inl
View File

@ -717,7 +717,11 @@ namespace detail
return _isnan(x) != 0; return _isnan(x) != 0;
# elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) # elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG))
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID) # if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
# if(GLM_PLATFORM_ANDROID_VERSION >= 19)
return std::isnan(x);
# else
return _isnan(x) != 0; return _isnan(x) != 0;
# endif
# else # else
return std::isnan(x); return std::isnan(x);
# endif # endif
@ -788,7 +792,11 @@ namespace detail
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF; return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
# elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) # elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG))
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID) # if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
# if(GLM_PLATFORM_ANDROID_VERSION >= 19)
return std::isinf(x);
# else
return _isinf(x) != 0; return _isinf(x) != 0;
# endif
# else # else
return std::isinf(x); return std::isinf(x);
# endif # endif

2
glm/detail/setup.hpp
View File

@ -68,6 +68,8 @@
# define GLM_PLATFORM GLM_PLATFORM_CHROME_NACL # define GLM_PLATFORM GLM_PLATFORM_CHROME_NACL
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
# define GLM_PLATFORM GLM_PLATFORM_ANDROID # define GLM_PLATFORM GLM_PLATFORM_ANDROID
# include <android/api-level.h>
# define GLM_PLATFORM_ANDROID_VERSION __ANDROID_API__
#elif defined(__linux) #elif defined(__linux)
# define GLM_PLATFORM GLM_PLATFORM_LINUX # define GLM_PLATFORM GLM_PLATFORM_LINUX
#elif defined(__unix) #elif defined(__unix)

1
readme.txt
View File

@ -42,6 +42,7 @@ GLM 0.9.5.4: 2014-0X-XX
- Fixed non-utf8 character #196 - Fixed non-utf8 character #196
- Added FindGLM install for CMake #189 - Added FindGLM install for CMake #189
- Fixed GTX_color_space - saturation #195 - Fixed GTX_color_space - saturation #195
- Fixed glm::isinf and glm::isnan for with Android NDK 9d #191
================================================================================ ================================================================================
GLM 0.9.5.3: 2014-04-02 GLM 0.9.5.3: 2014-04-02