Minor fixes

andrewevstyukhin · Nov 18, 2022 · 1b84011 · 1b84011
1 parent 87f9789
commit 1b84011
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Bc7CoreMode4.cpp b/src/Bc7CoreMode4.cpp
@@ -1711,7 +1711,7 @@ namespace Mode4 {
 		}
 	};
 
-	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water, const int rotation)
+	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water, const int rotation) noexcept
 	{
 		if (rotation & 4)
 		{

diff --git a/src/Bc7CoreMode5.cpp b/src/Bc7CoreMode5.cpp
@@ -864,7 +864,7 @@ namespace Mode5 {
 		}
 	};
 
-	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water, const int rotation)
+	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water, const int rotation) noexcept
 	{
 		Subset subset;
 		if (subset.InitLevels(area, water, rotation))
@@ -923,7 +923,7 @@ namespace Mode5 {
 		{
 			const int rotation = gRotationsMode5[rotationIndex];
 
-			if ((input.PersonalMode == 5) && (input.PersonalParameter == rotation))
+			if ((input.PersonalMode == 5) && (input.PersonalParameter == static_cast<uint32_t>(rotation)))
 				continue;
 
 			__m128i mc = _mm_setzero_si128();

diff --git a/src/Bc7CoreMode6.cpp b/src/Bc7CoreMode6.cpp
@@ -1291,7 +1291,7 @@ namespace Mode6 {
 		}
 	};
 
-	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water)
+	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water) noexcept
 	{
 		Subset subset3;
 		if (subset3.InitLevels<0x0101>(area, water))

diff --git a/src/Bc7CoreMode6Index2.cpp b/src/Bc7CoreMode6Index2.cpp
@@ -343,7 +343,7 @@ namespace Mode6Index2 {
 		}
 	};
 
-	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water)
+	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water) noexcept
 	{
 		Subset subset3;
 		if (subset3.InitLevels<0x0101>(area, water))
-Original file line number
+Diff line change
@@ Expand Up / @@ -1711,7 +1711,7 @@ namespace Mode4 { @@
     		}
     	};
-    	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water, const int rotation)
+    	static INLINED int CompressSubset(const Area& area, __m128i& mc, int water, const int rotation) noexcept
     	{
     		if (rotation & 4)
     		{
@@ Expand Down @@