From 3ab80ffe6dbd07cc109ba2c657c6f425c8075dbf Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Thu, 28 Jun 2012 19:40:42 +0100
Subject: [PATCH] Fixed #187, fixed bitfieldExtract for vector based type

---
 glm/core/func_integer.inl | 18 +++++++++---------
 readme.txt                |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/glm/core/func_integer.inl b/glm/core/func_integer.inl
index 013197ce..5de9fcbf 100644
--- a/glm/core/func_integer.inl
+++ b/glm/core/func_integer.inl
@@ -301,8 +301,8 @@ namespace glm
 	)
 	{
 		return detail::tvec2<T>(
-			bitfieldExtract(Value[0]),
-			bitfieldExtract(Value[1]));
+			bitfieldExtract(Value[0], Offset, Bits),
+			bitfieldExtract(Value[1], Offset, Bits));
 	}
 
 	template <typename T>
@@ -314,9 +314,9 @@ namespace glm
 	)
 	{
 		return detail::tvec3<T>(
-			bitfieldExtract(Value[0]),
-			bitfieldExtract(Value[1]),
-			bitfieldExtract(Value[2]));
+			bitfieldExtract(Value[0], Offset, Bits),
+			bitfieldExtract(Value[1], Offset, Bits),
+			bitfieldExtract(Value[2], Offset, Bits));
 	}
 
 	template <typename T>
@@ -328,10 +328,10 @@ namespace glm
 	)
 	{
 		return detail::tvec4<T>(
-			bitfieldExtract(Value[0]),
-			bitfieldExtract(Value[1]),
-			bitfieldExtract(Value[2]),
-			bitfieldExtract(Value[3]));
+			bitfieldExtract(Value[0], Offset, Bits),
+			bitfieldExtract(Value[1], Offset, Bits),
+			bitfieldExtract(Value[2], Offset, Bits),
+			bitfieldExtract(Value[3], Offset, Bits));
 	}
 
 	// bitfieldInsert
diff --git a/readme.txt b/readme.txt
index 1f1a943c..4e016f26 100644
--- a/readme.txt
+++ b/readme.txt
@@ -43,6 +43,7 @@ GLM 0.9.3.4: 2012-06-28
 - Removed VIRTREV_xstream and the incompatibility generated with GCC
 - Fixed C++11 compiler option for GCC
 - Removed MS language extension option for GCC (not fonctionnal)
+- Fixed bitfieldExtract for vector types
 
 ================================================================================
 GLM 0.9.3.3: 2012-05-10