Merge branch '0.9.7'

This commit is contained in:
Christophe Riccio 2016-02-21 19:40:47 +01:00
commit cb71d2376d
2 changed files with 2 additions and 2 deletions

View File

@ -210,7 +210,7 @@ namespace glm
{
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'atanh' only accept floating-point input");
if(abs(x) >= static_cast<genType>(1))
if(std::abs(x) >= static_cast<genType>(1))
return 0;
return static_cast<genType>(0.5) * log((static_cast<genType>(1) + x) / (static_cast<genType>(1) - x));
}

View File

@ -71,7 +71,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
#### [GLM 0.9.7.4](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX
##### Fixes:
- Fixed asinh warning with C++98 STL #484
- Fixed asinh and atanh warning with C++98 STL #484
#### [GLM 0.9.7.3](https://github.com/g-truc/glm/releases/tag/0.9.7.3) - 2016-02-21
##### Improvements: