Browse Source

Fixed GTX_extended_min_max filename typo #386

Christophe Riccio 10 years ago
parent
commit
8814ae50c9
5 changed files with 10 additions and 7 deletions
  1. 1 1
      glm/ext.hpp
  2. 3 3
      glm/gtx/extended_min_max.hpp
  3. 2 2
      glm/gtx/extended_min_max.inl
  4. 3 0
      readme.md
  5. 1 1
      test/core/core_func_common.cpp

+ 1 - 1
glm/ext.hpp

@@ -90,7 +90,7 @@
 #include "./gtx/dual_quaternion.hpp"
 #include "./gtx/dual_quaternion.hpp"
 #include "./gtx/euler_angles.hpp"
 #include "./gtx/euler_angles.hpp"
 #include "./gtx/extend.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_exponential.hpp"
 #include "./gtx/fast_square_root.hpp"
 #include "./gtx/fast_square_root.hpp"
 #include "./gtx/fast_trigonometry.hpp"
 #include "./gtx/fast_trigonometry.hpp"

+ 3 - 3
glm/gtx/extented_min_max.hpp → 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
 /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 /// THE SOFTWARE.
 /// 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
 /// @date 2007-03-14 / 2011-06-07
 /// @author Christophe Riccio
 /// @author Christophe Riccio
 ///
 ///
@@ -159,4 +159,4 @@ namespace glm
 	/// @}
 	/// @}
 }//namespace glm
 }//namespace glm
 
 
-#include "extented_min_max.inl"
+#include "extended_min_max.inl"

+ 2 - 2
glm/gtx/extented_min_max.inl → 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
 /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 /// THE SOFTWARE.
 /// 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
 /// @date 2007-03-14 / 2011-06-07
 /// @author Christophe Riccio
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////

+ 3 - 0
readme.md

@@ -60,6 +60,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Improved GTC_random linearRand documentation
 - Improved GTC_random linearRand documentation
 - Improved GTC_reciprocal 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
 #### [GLM 0.9.7.2](https://github.com/g-truc/glm/tree/0.9.7) - 2015-XX-XX
 ##### Fixes:
 ##### Fixes:
 - Fixed GTC_round floorMultiple/ceilMultiple #412
 - Fixed GTC_round floorMultiple/ceilMultiple #412

+ 1 - 1
test/core/core_func_common.cpp

@@ -1100,7 +1100,7 @@ namespace sign
 	{
 	{
 		int Error = 0;
 		int Error = 0;
 
 
-		glm::uint32 const Count = Samples;
+		glm::int32 const Count = static_cast<glm::int32>(Samples);
 
 
 		std::clock_t Timestamp0 = std::clock();
 		std::clock_t Timestamp0 = std::clock();
 		glm::int32 Sum = 0;
 		glm::int32 Sum = 0;