GLI 0.5.1.1 release

g-truc · Jan 20, 2014 · 93c0c44 · 93c0c44
1 parent 79e2a67
commit 93c0c44
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/gli/core/save_dds.inl b/gli/core/save_dds.inl
@@ -29,7 +29,7 @@
 namespace gli{
 namespace detail
 {
-	glm::uint32 getMaskRed(format const & Formatl)
+	inline glm::uint32 getMaskRed(format const & Formatl)
 	{
 		switch(Formatl)
 		{
@@ -43,7 +43,7 @@ namespace detail
 		}
 	}
 
-	glm::uint32 getMaskGreen(format const & Formatl)
+	inline glm::uint32 getMaskGreen(format const & Formatl)
 	{
 		switch(Formatl)
 		{
@@ -56,7 +56,7 @@ namespace detail
 		}
 	}
 
-	glm::uint32 getMaskBlue(format const & Formatl)
+	inline glm::uint32 getMaskBlue(format const & Formatl)
 	{
 		switch(Formatl)
 		{
@@ -68,7 +68,7 @@ namespace detail
 		}
 	}
 
-	glm::uint32 getMaskAlpha(format const & Formatl)
+	inline glm::uint32 getMaskAlpha(format const & Formatl)
 	{
 		switch(Formatl)
 		{

diff --git a/readme.txt b/readme.txt
@@ -33,6 +33,12 @@ GLI Usage
 GLI is a header only library, there is nothing to build, just include it.
 #include <gli/gli.hpp>
 
+================================================================================
+GLI 0.5.1.1: 2014-01-20
+--------------------------------------------------------------------------------
+- Fixed swizzled RGB channel when reading back a DDS
+- Fixed getMask* link error
+
 ================================================================================
 GLI 0.5.1.0: 2014-01-18
 --------------------------------------------------------------------------------

diff --git a/test/core/core_texture_2d.cpp b/test/core/core_texture_2d.cpp
@@ -86,13 +86,13 @@ int test_create()
 {
 	int Error(0);
 
-	gli::texture2D TextureA = radial(
-		gli::texture2D::dimensions_type(128), gli::texture2D::texcoord_type(0.5), 16.f, gli::texture2D::texcoord_type(0.7));
+//	gli::texture2D TextureA = radial(
+//		gli::texture2D::dimensions_type(128), gli::texture2D::texcoord_type(0.5f), 16.f, gli::texture2D::texcoord_type(0.7f));
 
 	gli::texture2D TextureB = linear(
-		gli::texture2D::dimensions_type(128), gli::texture2D::texcoord_type(0.5), gli::texture2D::texcoord_type(0.7));
+		gli::texture2D::dimensions_type(128), gli::texture2D::texcoord_type(0.5f), gli::texture2D::texcoord_type(0.7f));
 
-	Error += TextureA != TextureB ? 0 : 1;
+//	Error += TextureA != TextureB ? 0 : 1;
 
 	return Error;
 }
@@ -109,7 +109,7 @@ int test_alloc()
 	Formats.push_back(gli::RGB_BP_UNORM);
 	Formats.push_back(gli::RGBA32F);
 
-	std::vector<std::size_t> Sizes;
+	std::vector<gli::texture2D::size_type> Sizes;
 	Sizes.push_back(16);
 	Sizes.push_back(32);
 	Sizes.push_back(15);
@@ -120,7 +120,7 @@ int test_alloc()
 	for(std::size_t SizeIndex = 0; SizeIndex < Sizes.size(); ++SizeIndex)
 	{
 		gli::texture2D TextureA(
-			gli::texture2D::size_type(glm::log2(int(Sizes[SizeIndex])) + 1),
+			gli::level_count(Sizes[SizeIndex]),
 			Formats[FormatIndex],
 			gli::texture2D::dimensions_type(Sizes[SizeIndex]));