diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl index da58fc2c..902787fb 100644 --- a/glm/gtc/packing.inl +++ b/glm/gtc/packing.inl @@ -144,14 +144,14 @@ namespace detail GLM_FUNC_QUALIFIER glm::uint floatTo11bit(float x) { if(x == 0.0f) - return 0; + return 0u; else if(glm::isnan(x)) - return ~0; + return ~0u; else if(glm::isinf(x)) - return 0x1f << 6; + return 0x1Fu << 6u; # if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) - uint Pack = 0; + uint Pack = 0u; memcpy(&Pack, &x, sizeof(Pack)); # else uint Pack = reinterpret_cast(x); @@ -183,11 +183,11 @@ namespace detail GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x) { if(x == 0.0f) - return 0; + return 0u; else if(glm::isnan(x)) - return ~0; + return ~0u; else if(glm::isinf(x)) - return 0x1f << 5; + return 0x1Fu << 5u; # if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) uint Pack = 0; diff --git a/readme.txt b/readme.txt index 60e10716..d1c38d11 100644 --- a/readme.txt +++ b/readme.txt @@ -76,6 +76,7 @@ Fixes: - Fixed faceforward build #289 - Fixed decompose function VS2010 templating issues #294 - Fixed mat4x3 = mat2x3 * mat4x2 operator #297 +- Fixed warnings in F2x11_1x10 pcking function in GTC_packing #295 ================================================================================ GLM 0.9.6.1: 2014-12-10