diff --git a/src/ImageSharp/Formats/Tiff/TiffBitsPerSample.cs b/src/ImageSharp/Formats/Tiff/TiffBitsPerSample.cs
index b556e5b95f..c93e9b91b9 100644
--- a/src/ImageSharp/Formats/Tiff/TiffBitsPerSample.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffBitsPerSample.cs
@@ -16,21 +16,21 @@ namespace SixLabors.ImageSharp.Formats.Tiff
///
/// One bit per sample for bicolor images.
///
- One,
+ Bit1,
///
/// Four bits per sample for grayscale images with 16 different levels of gray or paletted images with a palette of 16 colors.
///
- Four,
+ Bit4,
///
/// Eight bits per sample for grayscale images with 256 different levels of gray or paletted images with a palette of 256 colors.
///
- Eight,
+ Bit8,
///
- /// Each channel has 8 Bits.
+ /// 24 bits per sample, each color channel has 8 Bits.
///
- Rgb888,
+ Bit24,
}
}
diff --git a/src/ImageSharp/Formats/Tiff/TiffBitsPerSampleExtensions.cs b/src/ImageSharp/Formats/Tiff/TiffBitsPerSampleExtensions.cs
index 307ae4ee9d..1b0778eb58 100644
--- a/src/ImageSharp/Formats/Tiff/TiffBitsPerSampleExtensions.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffBitsPerSampleExtensions.cs
@@ -18,13 +18,13 @@ namespace SixLabors.ImageSharp.Formats.Tiff
{
switch (tiffBitsPerSample)
{
- case TiffBitsPerSample.One:
+ case TiffBitsPerSample.Bit1:
return TiffConstants.BitsPerSample1Bit;
- case TiffBitsPerSample.Four:
+ case TiffBitsPerSample.Bit4:
return TiffConstants.BitsPerSample4Bit;
- case TiffBitsPerSample.Eight:
+ case TiffBitsPerSample.Bit8:
return TiffConstants.BitsPerSample8Bit;
- case TiffBitsPerSample.Rgb888:
+ case TiffBitsPerSample.Bit24:
return TiffConstants.BitsPerSampleRgb8Bit;
default:
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff
bitsPerSample[1] == TiffConstants.BitsPerSampleRgb8Bit[1] &&
bitsPerSample[2] == TiffConstants.BitsPerSampleRgb8Bit[2])
{
- return TiffBitsPerSample.Rgb888;
+ return TiffBitsPerSample.Bit24;
}
break;
@@ -55,17 +55,17 @@ namespace SixLabors.ImageSharp.Formats.Tiff
case 1:
if (bitsPerSample[0] == TiffConstants.BitsPerSample1Bit[0])
{
- return TiffBitsPerSample.One;
+ return TiffBitsPerSample.Bit1;
}
if (bitsPerSample[0] == TiffConstants.BitsPerSample4Bit[0])
{
- return TiffBitsPerSample.Four;
+ return TiffBitsPerSample.Bit4;
}
if (bitsPerSample[0] == TiffConstants.BitsPerSample8Bit[0])
{
- return TiffBitsPerSample.Eight;
+ return TiffBitsPerSample.Bit8;
}
break;
diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderOptionsParser.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderOptionsParser.cs
index fa90c45228..d11af70859 100644
--- a/src/ImageSharp/Formats/Tiff/TiffDecoderOptionsParser.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffDecoderOptionsParser.cs
@@ -79,19 +79,19 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Tiff
switch (options.BitsPerSample)
{
- case TiffBitsPerSample.Eight:
+ case TiffBitsPerSample.Bit8:
{
options.ColorType = TiffColorType.WhiteIsZero8;
break;
}
- case TiffBitsPerSample.Four:
+ case TiffBitsPerSample.Bit4:
{
options.ColorType = TiffColorType.WhiteIsZero4;
break;
}
- case TiffBitsPerSample.One:
+ case TiffBitsPerSample.Bit1:
{
options.ColorType = TiffColorType.WhiteIsZero1;
break;
@@ -116,19 +116,19 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Tiff
switch (options.BitsPerSample)
{
- case TiffBitsPerSample.Eight:
+ case TiffBitsPerSample.Bit8:
{
options.ColorType = TiffColorType.BlackIsZero8;
break;
}
- case TiffBitsPerSample.Four:
+ case TiffBitsPerSample.Bit4:
{
options.ColorType = TiffColorType.BlackIsZero4;
break;
}
- case TiffBitsPerSample.One:
+ case TiffBitsPerSample.Bit1:
{
options.ColorType = TiffColorType.BlackIsZero1;
break;
@@ -153,7 +153,7 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Tiff
if (options.PlanarConfiguration == TiffPlanarConfiguration.Chunky)
{
- options.ColorType = options.BitsPerSample == TiffBitsPerSample.Rgb888 ? TiffColorType.Rgb888 : TiffColorType.Rgb;
+ options.ColorType = options.BitsPerSample == TiffBitsPerSample.Bit24 ? TiffColorType.Rgb888 : TiffColorType.Rgb;
}
else
{
diff --git a/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs b/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs
index 5d36744227..5217650da9 100644
--- a/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs
@@ -97,7 +97,7 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Tiff
if (this.PhotometricInterpretation == TiffPhotometricInterpretation.WhiteIsZero
|| this.PhotometricInterpretation == TiffPhotometricInterpretation.BlackIsZero)
{
- return TiffBitsPerSample.One;
+ return TiffBitsPerSample.Bit1;
}
TiffThrowHelper.ThrowNotSupported("The TIFF BitsPerSample entry is missing which is required to decode the image.");
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
index a7279c9421..dd5fc1a280 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
@@ -188,7 +188,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
Assert.Equal(32u, frame.Width);
Assert.Equal(32u, frame.Height);
- Assert.Equal(TiffBitsPerSample.Four, frame.BitsPerSample);
+ Assert.Equal(TiffBitsPerSample.Bit4, frame.BitsPerSample);
Assert.Equal(TiffCompression.Lzw, frame.Compression);
Assert.Equal(TiffPhotometricInterpretation.PaletteColor, frame.PhotometricInterpretation);
Assert.Equal("This is Название", frame.ExifProfile.GetValue(ExifTag.ImageDescription).Value);