Browse Source

Fixed ticket #116, missing bit mask

Christophe Riccio 14 years ago
parent
commit
2732d4bae5
1 changed files with 4 additions and 4 deletions
  1. 4 4
      glm/gtx/color_cast.inl

+ 4 - 4
glm/gtx/color_cast.inl

@@ -356,10 +356,10 @@ template <>
 GLM_FUNC_QUALIFIER detail::tvec4<float> f32_bgra_cast<uint32>(uint32 color)
 GLM_FUNC_QUALIFIER detail::tvec4<float> f32_bgra_cast<uint32>(uint32 color)
 {
 {
 	detail::tvec4<float> result;
 	detail::tvec4<float> result;
-	result.x = static_cast<float>(color >> 16) / static_cast<float>(255);
-	result.y = static_cast<float>(color >>  8) / static_cast<float>(255);
-	result.z = static_cast<float>(color >>  0) / static_cast<float>(255);
-	result.w = static_cast<float>(color >> 24) / static_cast<float>(255);
+	result.x = static_cast<float>((color >> 16) & 0xFF) / static_cast<float>(255);
+	result.y = static_cast<float>((color >>  8) & 0xFF) / static_cast<float>(255);
+	result.z = static_cast<float>((color >>  0) & 0xFF) / static_cast<float>(255);
+	result.w = static_cast<float>((color >> 24) & 0xFF) / static_cast<float>(255);
 	return result;
 	return result;
 }
 }