Small fixes and variable naming

Erik-White · Erik-White · commit 94d0f721ae3c · 2026-03-06T16:23:33.000+01:00
diff --git a/src/ImageSharp.Textures/Compression/Astc/ColorEncoding/EndpointEncoder.cs b/src/ImageSharp.Textures/Compression/Astc/ColorEncoding/EndpointEncoder.cs
@@ -140,7 +140,7 @@ public static bool EncodeColorsForMode(Rgba32 endpointLowRgba, Rgba32 endpointHi
                 break;
             }
 
-            case EndpointEncodingMode.DirectRbg:
+            case EndpointEncodingMode.DirectRgb:
             case EndpointEncodingMode.DirectRgba:
                 return EncodeColorsRGBA(endpointLowRgba, endpointHighRgba, maxValue, encodingMode == EndpointEncodingMode.DirectRgba, out astcMode, values);
             default:
diff --git a/src/ImageSharp.Textures/Compression/Astc/ColorEncoding/EndpointEncodingMode.cs b/src/ImageSharp.Textures/Compression/Astc/ColorEncoding/EndpointEncodingMode.cs
@@ -9,6 +9,6 @@ internal enum EndpointEncodingMode
     DirectLumaAlpha,
     BaseScaleRgb,
     BaseScaleRgba,
-    DirectRbg,
+    DirectRgb,
     DirectRgba
 }
diff --git a/src/ImageSharp.Textures/Compression/Astc/ColorEncoding/EndpointEncodingModeExtensions.cs b/src/ImageSharp.Textures/Compression/Astc/ColorEncoding/EndpointEncodingModeExtensions.cs
@@ -9,7 +9,7 @@ internal static class EndpointEncodingModeExtensions
     {
         EndpointEncodingMode.DirectLuma => 2,
         EndpointEncodingMode.DirectLumaAlpha or EndpointEncodingMode.BaseScaleRgb => 4,
-        EndpointEncodingMode.DirectRbg or EndpointEncodingMode.BaseScaleRgba => 6,
+        EndpointEncodingMode.DirectRgb or EndpointEncodingMode.BaseScaleRgba => 6,
         _ => 8
     };
 }
diff --git a/src/ImageSharp.Textures/Compression/Astc/IO/AstcFile.cs b/src/ImageSharp.Textures/Compression/Astc/IO/AstcFile.cs
@@ -64,6 +64,6 @@ public static AstcFile FromMemory(byte[] data)
         (10, 10) => Footprint.FromFootprintType(FootprintType.Footprint10x10),
         (12, 10) => Footprint.FromFootprintType(FootprintType.Footprint12x10),
         (12, 12) => Footprint.FromFootprintType(FootprintType.Footprint12x12),
-        _ => throw new ArgumentOutOfRangeException($"Unsupported block dimensions: {this.header.BlockWidth}x{this.header.BlockHeight}"),
+        _ => throw new NotSupportedException($"Unsupported block dimensions: {this.header.BlockWidth}x{this.header.BlockHeight}"),
     };
 }
diff --git a/src/ImageSharp.Textures/Formats/Ktx/KtxProcessor.cs b/src/ImageSharp.Textures/Formats/Ktx/KtxProcessor.cs
@@ -128,7 +128,7 @@ public MipMap[] DecodeMipMaps(Stream stream, int width, int height, uint count)
                                 return this.AllocateMipMaps<RgbaAstc8X8>(stream, width, height, count);
                             case GlInternalPixelFormat.CompressedRgbaAstc10x5Khr:
                             case GlInternalPixelFormat.CompressedSrgb8Alpha8Astc10x5Khr:
-                                return this.AllocateMipMaps<RgbaAstc10x5>(stream, width, height, count);
+                                return this.AllocateMipMaps<RgbaAstc10X5>(stream, width, height, count);
                             case GlInternalPixelFormat.CompressedRgbaAstc10x6Khr:
                             case GlInternalPixelFormat.CompressedSrgb8Alpha8Astc10x6Khr:
                                 return this.AllocateMipMaps<RgbaAstc10X6>(stream, width, height, count);
@@ -267,7 +267,7 @@ public CubemapTexture DecodeCubeMap(Stream stream, int width, int height)
                             return this.AllocateCubeMap<RgbaAstc8X8>(stream, width, height);
                         case GlInternalPixelFormat.CompressedRgbaAstc10x5Khr:
                         case GlInternalPixelFormat.CompressedSrgb8Alpha8Astc10x5Khr:
-                            return this.AllocateCubeMap<RgbaAstc10x5>(stream, width, height);
+                            return this.AllocateCubeMap<RgbaAstc10X5>(stream, width, height);
                         case GlInternalPixelFormat.CompressedRgbaAstc10x6Khr:
                         case GlInternalPixelFormat.CompressedSrgb8Alpha8Astc10x6Khr:
                             return this.AllocateCubeMap<RgbaAstc10X6>(stream, width, height);
diff --git a/src/ImageSharp.Textures/Formats/Ktx2/Ktx2DecoderCore.cs b/src/ImageSharp.Textures/Formats/Ktx2/Ktx2DecoderCore.cs
@@ -113,7 +113,7 @@ public Texture DecodeTexture(Stream stream)
                     }
                 }
 
-                if (stream.Position < maxEndPosition && stream.CanSeek)
+                if (stream.CanSeek && stream.Position < maxEndPosition)
                 {
                     stream.Position = maxEndPosition;
                 }
diff --git a/src/ImageSharp.Textures/Formats/Ktx2/Ktx2Processor.cs b/src/ImageSharp.Textures/Formats/Ktx2/Ktx2Processor.cs
@@ -189,7 +189,7 @@ public MipMap[] DecodeMipMaps(Stream stream, int width, int height, LevelIndex[]
                     return AllocateMipMaps<RgbaAstc8X8>(memoryStream, width, height, levelIndices);
                 case VkFormat.VK_FORMAT_ASTC_10x5_UNORM_BLOCK:
                 case VkFormat.VK_FORMAT_ASTC_10x5_SRGB_BLOCK:
-                    return AllocateMipMaps<RgbaAstc10x5>(memoryStream, width, height, levelIndices);
+                    return AllocateMipMaps<RgbaAstc10X5>(memoryStream, width, height, levelIndices);
                 case VkFormat.VK_FORMAT_ASTC_10x6_UNORM_BLOCK:
                 case VkFormat.VK_FORMAT_ASTC_10x6_SRGB_BLOCK:
                     return AllocateMipMaps<RgbaAstc10X6>(memoryStream, width, height, levelIndices);
@@ -364,7 +364,7 @@ public CubemapTexture DecodeCubeMap(Stream stream, int width, int height, LevelI
                     return AllocateCubeMap<RgbaAstc8X8>(stream, width, height, levelIndices);
                 case VkFormat.VK_FORMAT_ASTC_10x5_UNORM_BLOCK:
                 case VkFormat.VK_FORMAT_ASTC_10x5_SRGB_BLOCK:
-                    return AllocateCubeMap<RgbaAstc10x5>(stream, width, height, levelIndices);
+                    return AllocateCubeMap<RgbaAstc10X5>(stream, width, height, levelIndices);
                 case VkFormat.VK_FORMAT_ASTC_10x6_UNORM_BLOCK:
                 case VkFormat.VK_FORMAT_ASTC_10x6_SRGB_BLOCK:
                     return AllocateCubeMap<RgbaAstc10X6>(stream, width, height, levelIndices);
diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/RgbaAstc10x5.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/RgbaAstc10x5.cs
@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Textures.TextureFormats.Decoding;
 /// <summary>
 /// Texture compressed with RgbaAstc10x5.
 /// </summary>
-internal readonly struct RgbaAstc10x5 : IBlock<RgbaAstc10x5>
+internal readonly struct RgbaAstc10X5 : IBlock<RgbaAstc10X5>
 {
     public static Size BlockSize => new(10, 5);
 
diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/RgbaAstc12x12.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/RgbaAstc12x12.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Textures.TextureFormats.Decoding;
     public static Size BlockSize => new(12, 12);
 
     /// <inheritdoc/>
-    public int BitsPerPixel => 128 / (BlockSize.Width * BlockSize.Height);
+    public int BitsPerPixel => 1; // Actually 0.888... but we round up for simplicity
 
     /// <inheritdoc/>
     public byte PixelDepthBytes => 4;
diff --git a/tests/ImageSharp.Textures.Benchmarks/AstcDecodingBenchmark.cs b/tests/ImageSharp.Textures.Benchmarks/AstcDecodingBenchmark.cs
@@ -29,9 +29,9 @@ public bool ParseBlock()
         blocks[..16].CopyTo(blockBytes);
         ulong low = BitConverter.ToUInt64(blockBytes);
         ulong high = BitConverter.ToUInt64(blockBytes[8..]);
-        PhysicalBlock phyiscalBlock = PhysicalBlock.Create((UInt128)low | ((UInt128)high << 64));
+        PhysicalBlock physicalBlock = PhysicalBlock.Create((UInt128)low | ((UInt128)high << 64));
 
-        return !phyiscalBlock.IsIllegalEncoding;
+        return !physicalBlock.IsIllegalEncoding;
     }
 
     [Benchmark]
diff --git a/tests/ImageSharp.Textures.Tests/Formats/Astc/EndpointCodecTests.cs b/tests/ImageSharp.Textures.Tests/Formats/Astc/EndpointCodecTests.cs
@@ -16,7 +16,7 @@ public class EndpointCodecTests
     [InlineData(EndpointEncodingMode.DirectLumaAlpha)]
     [InlineData(EndpointEncodingMode.BaseScaleRgb)]
     [InlineData(EndpointEncodingMode.BaseScaleRgba)]
-    [InlineData(EndpointEncodingMode.DirectRbg)]
+    [InlineData(EndpointEncodingMode.DirectRgb)]
     [InlineData(EndpointEncodingMode.DirectRgba)]
     internal void EncodeColorsForMode_WithVariousRanges_ShouldProduceValidQuantizedValues(EndpointEncodingMode mode)
     {
@@ -41,7 +41,7 @@ internal void EncodeColorsForMode_WithVariousRanges_ShouldProduceValidQuantizedV
     [InlineData(EndpointEncodingMode.DirectLumaAlpha)]
     [InlineData(EndpointEncodingMode.BaseScaleRgb)]
     [InlineData(EndpointEncodingMode.BaseScaleRgba)]
-    [InlineData(EndpointEncodingMode.DirectRbg)]
+    [InlineData(EndpointEncodingMode.DirectRgb)]
     [InlineData(EndpointEncodingMode.DirectRgba)]
     internal void EncodeDecodeColors_WithBlackAndWhite_ShouldPreserveColors(EndpointEncodingMode mode)
     {
@@ -105,7 +105,7 @@ public void EncodeColorsForMode_WithRgbDirectAndSpecificPairs_ShouldUseBlueContr
         foreach ((Rgba32 low, Rgba32 high) in pairs)
         {
             List<int> values = [];
-            EndpointEncoder.EncodeColorsForMode(low, high, endpointRange, EndpointEncodingMode.DirectRbg, out ColorEndpointMode astcMode, values);
+            EndpointEncoder.EncodeColorsForMode(low, high, endpointRange, EndpointEncodingMode.DirectRgb, out ColorEndpointMode astcMode, values);
 
             Assert.True(EndpointEncoder.UsesBlueContract(endpointRange, astcMode, values));
         }
@@ -184,7 +184,7 @@ public void EncodeDecodeColors_WithLumaAlphaDirect_ShouldPreserveLumaAndAlpha()
     [Fact]
     public void EncodeDecodeColors_WithRgbDirectAndRandomColors_ShouldPreserveColors()
     {
-        EndpointEncodingMode mode = EndpointEncodingMode.DirectRbg;
+        EndpointEncodingMode mode = EndpointEncodingMode.DirectRgb;
         Random random = new(unchecked((int)0xdeadbeef));
 
         for (int i = 0; i < 100; ++i)
@@ -201,7 +201,7 @@ public void EncodeDecodeColors_WithRgbDirectAndRandomColors_ShouldPreserveColors
     [Fact]
     public void EncodeDecodeColors_WithRgbDirectAndSpecificColors_ShouldMatchExpected()
     {
-        EndpointEncodingMode mode = EndpointEncodingMode.DirectRbg;
+        EndpointEncodingMode mode = EndpointEncodingMode.DirectRgb;
 
         (Rgba32 low, Rgba32 high) = EncodeAndDecodeColors(
             new Rgba32(64, 127, 192, 255),
diff --git a/tests/ImageSharp.Textures.Tests/Formats/Ktx2/Ktx2AstcDecoderCubemapTests.cs b/tests/ImageSharp.Textures.Tests/Formats/Ktx2/Ktx2AstcDecoderCubemapTests.cs
@@ -27,6 +27,8 @@ public void CanDecode_All_Faces(TestTextureProvider provider)
         provider.SaveTextures(texture);
         CubemapTexture cubemapTexture = texture as CubemapTexture;
 
+        Assert.NotNull(cubemapTexture);
+
         using Image posXImage = cubemapTexture.PositiveX.MipMaps[0].GetImage();
         (posXImage as Image<Rgba32>).CompareToReferenceOutput(
             ImageComparer.Exact,

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public static bool EncodeColorsForMode(Rgba32 endpointLowRgba, Rgba32 endpointHi`
`140`	`140`	`break;`
`141`	`141`	`}`
`142`	`142`
`143`		`- case EndpointEncodingMode.DirectRbg:`
	`143`	`+ case EndpointEncodingMode.DirectRgb:`
`144`	`144`	`case EndpointEncodingMode.DirectRgba:`
`145`	`145`	`return EncodeColorsRGBA(endpointLowRgba, endpointHighRgba, maxValue, encodingMode == EndpointEncodingMode.DirectRgba, out astcMode, values);`
`146`	`146`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ internal enum EndpointEncodingMode`
`9`	`9`	`DirectLumaAlpha,`
`10`	`10`	`BaseScaleRgb,`
`11`	`11`	`BaseScaleRgba,`
`12`		`- DirectRbg,`
	`12`	`+ DirectRgb,`
`13`	`13`	`DirectRgba`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal static class EndpointEncodingModeExtensions`
`9`	`9`	`{`
`10`	`10`	`EndpointEncodingMode.DirectLuma => 2,`
`11`	`11`	`EndpointEncodingMode.DirectLumaAlpha or EndpointEncodingMode.BaseScaleRgb => 4,`
`12`		`- EndpointEncodingMode.DirectRbg or EndpointEncodingMode.BaseScaleRgba => 6,`
	`12`	`+ EndpointEncodingMode.DirectRgb or EndpointEncodingMode.BaseScaleRgba => 6,`
`13`	`13`	`_ => 8`
`14`	`14`	`};`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ public static AstcFile FromMemory(byte[] data)`
`64`	`64`	`(10, 10) => Footprint.FromFootprintType(FootprintType.Footprint10x10),`
`65`	`65`	`(12, 10) => Footprint.FromFootprintType(FootprintType.Footprint12x10),`
`66`	`66`	`(12, 12) => Footprint.FromFootprintType(FootprintType.Footprint12x12),`
`67`		`- _ => throw new ArgumentOutOfRangeException($"Unsupported block dimensions: {this.header.BlockWidth}x{this.header.BlockHeight}"),`
	`67`	`+ _ => throw new NotSupportedException($"Unsupported block dimensions: {this.header.BlockWidth}x{this.header.BlockHeight}"),`
`68`	`68`	`};`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public Texture DecodeTexture(Stream stream)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- if (stream.Position < maxEndPosition && stream.CanSeek)`
	`116`	`+ if (stream.CanSeek && stream.Position < maxEndPosition)`
`117`	`117`	`{`
`118`	`118`	`stream.Position = maxEndPosition;`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Textures.TextureFormats.Decoding;`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Texture compressed with RgbaAstc10x5.`
`8`	`8`	`/// </summary>`
`9`		`-internal readonly struct RgbaAstc10x5 : IBlock<RgbaAstc10x5>`
	`9`	`+internal readonly struct RgbaAstc10X5 : IBlock<RgbaAstc10X5>`
`10`	`10`	`{`
`11`	`11`	`public static Size BlockSize => new(10, 5);`
`12`	`12`