Browse Source

Merge 0.9.8 branch

Christophe Riccio 8 years ago
parent
commit
ff64d51a1c
2 changed files with 3 additions and 2 deletions
  1. 2 2
      glm/detail/func_common.inl
  2. 1 0
      readme.md

+ 2 - 2
glm/detail/func_common.inl

@@ -514,7 +514,7 @@ namespace detail
 	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<L, T, P> min(vecType<L, T, P> const & a, T b)
 	{
-		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point inputs for the interpolator a");
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || std::numeric_limits<T>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point or integer inputs");
 		return detail::compute_min_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(a, vecType<L, T, P>(b));
 	}
 
@@ -528,7 +528,7 @@ namespace detail
 	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<L, T, P> max(vecType<L, T, P> const & a, T b)
 	{
-		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point inputs for the interpolator a");
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || std::numeric_limits<T>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point or integer inputs");
 		return detail::compute_max_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(a, vecType<L, T, P>(b));
 	}
 

+ 1 - 0
readme.md

@@ -89,6 +89,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 #### Fixes:
 - Fixed Clang version detection from source #608
 - Fixed packF3x9_E1x5 exponent packing #614
+- Fixed build error min and max specializations with integer #616
 
 ---
 ### [GLM 0.9.8.4](https://github.com/g-truc/glm/releases/tag/0.9.8.4) - 2017-01-22