diff --git a/glm/ext.hpp b/glm/ext.hpp index bdf050a9..5f662761 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -90,7 +90,7 @@ #include "./gtx/dual_quaternion.hpp" #include "./gtx/euler_angles.hpp" #include "./gtx/extend.hpp" -#include "./gtx/extented_min_max.hpp" +#include "./gtx/extended_min_max.hpp" #include "./gtx/fast_exponential.hpp" #include "./gtx/fast_square_root.hpp" #include "./gtx/fast_trigonometry.hpp" diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extended_min_max.hpp similarity index 97% rename from glm/gtx/extented_min_max.hpp rename to glm/gtx/extended_min_max.hpp index 08d56f17..dacf5d42 100644 --- a/glm/gtx/extented_min_max.hpp +++ b/glm/gtx/extended_min_max.hpp @@ -24,8 +24,8 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. /// -/// @ref gtx_extented_min_max -/// @file glm/gtx/extented_min_max.hpp +/// @ref gtx_extended_min_max +/// @file glm/gtx/extended_min_max.hpp /// @date 2007-03-14 / 2011-06-07 /// @author Christophe Riccio /// @@ -159,4 +159,4 @@ namespace glm /// @} }//namespace glm -#include "extented_min_max.inl" +#include "extended_min_max.inl" diff --git a/glm/gtx/extented_min_max.inl b/glm/gtx/extended_min_max.inl similarity index 98% rename from glm/gtx/extented_min_max.inl rename to glm/gtx/extended_min_max.inl index e54c8479..f8dd0e20 100644 --- a/glm/gtx/extented_min_max.inl +++ b/glm/gtx/extended_min_max.inl @@ -24,8 +24,8 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. /// -/// @ref gtx_extented_min_max -/// @file glm/gtx/extented_min_max.inl +/// @ref gtx_extended_min_max +/// @file glm/gtx/extended_min_max.inl /// @date 2007-03-14 / 2011-06-07 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/readme.md b/readme.md index d392483d..96f19f69 100644 --- a/readme.md +++ b/readme.md @@ -60,6 +60,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Improved GTC_random linearRand documentation - Improved GTC_reciprocal documentation +##### Fixes: +- Fixed GTX_extended_min_max filename typo #386 + #### [GLM 0.9.7.2](https://github.com/g-truc/glm/tree/0.9.7) - 2015-XX-XX ##### Fixes: - Fixed GTC_round floorMultiple/ceilMultiple #412 diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp index ed4e5d5d..43dade52 100644 --- a/test/core/core_func_common.cpp +++ b/test/core/core_func_common.cpp @@ -1100,7 +1100,7 @@ namespace sign { int Error = 0; - glm::uint32 const Count = Samples; + glm::int32 const Count = static_cast(Samples); std::clock_t Timestamp0 = std::clock(); glm::int32 Sum = 0;