mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve aliasing issues #152, #212

Browse Source
This commit is contained in:
Christophe Riccio 2014-06-21 07:41:30 -04:00
parent 381e1627b8
commit b69356cadb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glm/gtc/packing.inl
View File

@ -170,6 +170,7 @@ namespace detail
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
float Temp = 0;
memcpy(&Temp, &Result, sizeof(Temp));
return Temp;
# else
return reinterpret_cast<float&>(Result);
# endif
@ -184,7 +185,13 @@ namespace detail
else if(glm::isinf(x))
return 0x1f << 5;
uint Pack = reinterpret_cast<uint&>(x);
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
uint Pack = 0;
memcpy(&Pack, &x, sizeof(Pack));
# else
uint Pack = reinterpret_cast<uint&>(x);
# endif
return float2packed10(Pack);
}
@ -197,8 +204,15 @@ namespace detail
else if(x == (0x1f << 5))
return ~0;//Inf
uint result = packed10ToFloat(x);
return reinterpret_cast<float&>(result);
uint Result = packed10ToFloat(x);
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
float Temp = 0;
memcpy(&Temp, &Result, sizeof(Temp));
return Temp;
# else
return reinterpret_cast<float&>(Result);
# endif
}
// GLM_FUNC_QUALIFIER glm::uint f11_f11_f10(float x, float y, float z)

1
readme.txt
View File

@ -54,6 +54,7 @@ GLM 0.9.5.4: 2014-0X-XX
- Fixed tweakedInfinitePerspective #208 and added user-defined epsilon to
tweakedInfinitePerspective
- Fixed std::copy and std::vector with GLM types #214
- Fixed aliasing issues #212, #152
================================================================================
GLM 0.9.5.3: 2014-04-02