Merge branch '0.9.1' into gtx_ulp

doc/src/data.xml

@@ -3,7 +3,8 @@
 <glm copyright="Copyright © 2005 - 2011">
   <downloads>
     <section name="GLM - zip files">
-      <download name="GLM 0.9.1.1" date="17/03/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.1/glm-0.9.1.1.zip/download"/>
+        <download name="GLM 0.9.1.2" date="12/04/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.zip/download"/>
+        <download name="GLM 0.9.1.1" date="17/03/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.1/glm-0.9.1.1.zip/download"/>
       <download name="GLM 0.9.1.0" date="03/03/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.zip/download"/>
       <download name="GLM 0.9.1.B" date="13/02/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.zip/download"/>
       <download name="GLM 0.9.0.8" date="13/02/2010" size="3.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.8/glm-0.9.0.8.zip/download"/>
@@ -60,7 +61,8 @@
       <download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/>
     </section>
     <section name="GLM - 7z files">
-      <download name="GLM 0.9.1.1" date="17/03/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.1/glm-0.9.1.1.7z/download"/>
+      <download name="GLM 0.9.1.2" date="12/04/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.7z/download"/>
+        <download name="GLM 0.9.1.1" date="17/03/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.1/glm-0.9.1.1.7z/download"/>
 		  <download name="GLM 0.9.1.0" date="03/03/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.7z/download"/>
       <download name="GLM 0.9.1.B" date="13/02/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.7z/download"/>
       <download name="GLM 0.9.0.8" date="13/02/2011" size="1.9 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.8/glm-0.9.0.8.7z/download"/>
@@ -150,6 +152,16 @@
   </todo>
 
   <page_news>
+      <news index="0063" date="12/04/2011" title="GLM 0.9.1.2 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
+          <paragraph>
+              Only bug fixes for GLM 0.9.1.2.
+          </paragraph>
+          
+          <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.zip/download">GLM 0.9.1.2 (zip)</source>
+          <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.7z/download">GLM 0.9.1.2 (7z)</source>
+          <source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
+      </news>
+      
       <news index="0062" date="17/03/2011" title="GLM 0.9.1.1 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
     <paragraph>
 		GLM 0.9.1.1 fixes some bugs, warnings on Clang C++ and clean up a bit the code.

glm/core/func_common.inl

@@ -1402,18 +1402,6 @@ namespace glm
 		return fi.f;
 	}
 
-	inline float intBitsToFloat(uint const & value)
-	{
-		union
-		{
-			float f;
-			uint u;
-		} fu;
-
-		fu.u = value;
-		return fu.f;
-	}
-
     template <typename T>
     inline detail::tvec2<float> intBitsToFloat
 	(
@@ -1447,6 +1435,51 @@ namespace glm
             intBitsToFloat(value.y));
     }
 
+    inline float uintBitsToFloat(uint const & value)
+    {
+        union
+        {
+            float f;
+            uint u;
+        } fu;
+
+        fu.u = value;
+        return fu.f;
+    }
+
+    template <typename T>
+    inline detail::tvec2<float> uintBitsToFloat
+	(
+		detail::tvec2<T> const & value
+	)
+    {
+        return detail::tvec2<T>(
+            uintBitsToFloat(value.x),
+            uintBitsToFloat(value.y));
+    }
+
+    template <typename T>
+    inline detail::tvec3<float> uintBitsToFloat
+	(
+		detail::tvec3<T> const & value
+	)
+    {
+        return detail::tvec3<T>(
+            uintBitsToFloat(value.x),
+            uintBitsToFloat(value.y));
+    }
+
+    template <typename T>
+    inline detail::tvec4<float> uintBitsToFloat
+	(
+		detail::tvec4<T> const & value
+	)
+    {
+        return detail::tvec4<T>(
+            uintBitsToFloat(value.x),
+            uintBitsToFloat(value.y));
+    }
+
 	template <typename genType>
 	inline genType fma
 	(

glm/gtx/quaternion.hpp

@@ -121,7 +121,7 @@ namespace glm
 		detail::tvec3<valType> axis(
 			detail::tquat<valType> const & x);
 
-		//! Build a quaternion from an angle and an axis. 
+		//! Build a quaternion from an angle and a normalized axis. 
 		//! From GLM_GTX_quaternion extension.
 		template <typename valType> 
 		detail::tquat<valType> angleAxis(
@@ -130,12 +130,12 @@ namespace glm
 			valType const & y, 
 			valType const & z);
 
-        //! Build a quaternion from an angle and an axis.
+        //! Build a quaternion from an angle and a normalized axis.
 		//! From GLM_GTX_quaternion extension.
 		template <typename valType> 
 		detail::tquat<valType> angleAxis(
 			valType const & angle, 
-			detail::tvec3<valType> const & v);
+			detail::tvec3<valType> const & axis);
 
 		//! Extract the real component of a quaternion.
 		//! From GLM_GTX_quaternion extension.

glm/gtx/quaternion.inl

@@ -185,7 +185,6 @@ namespace quaternion
 	)
     {
         detail::tquat<valType> result;
-        detail::tvec3<valType> v_normalized = glm::normalize(v);
 
 		valType a = glm::radians(angle);
         valType s = glm::sin(a * valType(0.5));

readme.txt

@@ -13,6 +13,11 @@ GLM is a header only library, there is nothing to build, just include it.
 More informations in GLM manual:
 http://glm.g-truc.net/glm-0.9.1.pdf
 
+================================================================================
+GLM 0.9.1.2: 2010-04-12
+--------------------------------------------------------------------------------
+- Fixed bugs
+
 ================================================================================
 GLM 0.9.1.1: 2010-03-17
 --------------------------------------------------------------------------------