From a124685c9b0229a76b956862374482b25d706090 Mon Sep 17 00:00:00 2001 From: Brian Popow Date: Sun, 29 Nov 2020 12:49:46 +0100 Subject: [PATCH] Fix compression namespace --- .../Tiff/Compression/DeflateTiffCompression.cs | 2 +- .../Tiff/Compression/LzwTiffCompression.cs | 2 +- .../Tiff/Compression/NoneTiffCompression.cs | 2 +- .../Tiff/Compression/PackBitsTiffCompression.cs | 2 +- .../Tiff/Compression/TiffBaseCompression.cs | 2 +- .../Tiff/Compression/TiffCompressionFactory.cs | 17 ++++++++--------- ...ionType.cs => TiffDecoderCompressionType.cs} | 6 +++--- src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs | 4 +++- .../Formats/Tiff/TiffDecoderHelpers.cs | 13 +++++++------ .../Compression/DeflateTiffCompressionTests.cs | 5 ++--- .../Tiff/Compression/LzwTiffCompressionTests.cs | 1 + .../Compression/NoneTiffCompressionTests.cs | 2 +- .../Compression/PackBitsTiffCompressionTests.cs | 1 + 13 files changed, 31 insertions(+), 28 deletions(-) rename src/ImageSharp/Formats/Tiff/Compression/{TiffCompressionType.cs => TiffDecoderCompressionType.cs} (88%) diff --git a/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs index 3e07851d4f..8251f9aab7 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs @@ -6,7 +6,7 @@ using System.IO; using System.IO.Compression; using SixLabors.ImageSharp.Memory; -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { /// /// Class to handle cases where TIFF image data is compressed using Deflate compression. diff --git a/src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs index f4caeb3c27..0e98d5303a 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs @@ -5,7 +5,7 @@ using System; using System.IO; using SixLabors.ImageSharp.Memory; -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { /// /// Class to handle cases where TIFF image data is compressed using LZW compression. diff --git a/src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs index ad6801c6a4..39b7ca23de 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs @@ -5,7 +5,7 @@ using System; using System.IO; using SixLabors.ImageSharp.Memory; -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { /// /// Class to handle cases where TIFF image data is not compressed. diff --git a/src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs index 9862fea744..dc89b650ee 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs @@ -6,7 +6,7 @@ using System.Buffers; using System.IO; using SixLabors.ImageSharp.Memory; -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { /// /// Class to handle cases where TIFF image data is compressed using PackBits compression. diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs index fb05a9f253..f24db500b3 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs @@ -5,7 +5,7 @@ using System; using System.IO; using SixLabors.ImageSharp.Memory; -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { /// /// Base tiff decompressor class. diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs index 11f85faa10..d32052fcd6 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs @@ -1,28 +1,27 @@ // Copyright (c) Six Labors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Formats.Tiff.Compression; using SixLabors.ImageSharp.Memory; -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { internal static class TiffCompressionFactory { - public static TiffBaseCompression Create(TiffCompressionType compressionType, MemoryAllocator allocator, TiffPhotometricInterpretation photometricInterpretation, int width) + public static TiffBaseCompression Create(TiffDecoderCompressionType compressionType, MemoryAllocator allocator, TiffPhotometricInterpretation photometricInterpretation, int width) { switch (compressionType) { - case TiffCompressionType.None: + case TiffDecoderCompressionType.None: return new NoneTiffCompression(allocator); - case TiffCompressionType.PackBits: + case TiffDecoderCompressionType.PackBits: return new PackBitsTiffCompression(allocator); - case TiffCompressionType.Deflate: + case TiffDecoderCompressionType.Deflate: return new DeflateTiffCompression(allocator); - case TiffCompressionType.Lzw: + case TiffDecoderCompressionType.Lzw: return new LzwTiffCompression(allocator); - case TiffCompressionType.T4: + case TiffDecoderCompressionType.T4: return new T4TiffCompression(allocator, photometricInterpretation, width); - case TiffCompressionType.HuffmanRle: + case TiffDecoderCompressionType.HuffmanRle: return new ModifiedHuffmanTiffCompression(allocator, photometricInterpretation, width); default: throw TiffThrowHelper.NotSupportedCompression(nameof(compressionType)); diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffDecoderCompressionType.cs similarity index 88% rename from src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs rename to src/ImageSharp/Formats/Tiff/Compression/TiffDecoderCompressionType.cs index 8a33948f96..80bc0af5ab 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/TiffDecoderCompressionType.cs @@ -1,12 +1,12 @@ // Copyright (c) Six Labors. // Licensed under the Apache License, Version 2.0. -namespace SixLabors.ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff.Compression { /// - /// Provides enumeration of the various TIFF compression types. + /// Provides enumeration of the various TIFF compression types the decoder can handle. /// - internal enum TiffCompressionType + internal enum TiffDecoderCompressionType { /// /// Image data is stored uncompressed in the TIFF file. diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs index 08b00d5bac..16f64e3506 100644 --- a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs +++ b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs @@ -5,6 +5,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; + +using SixLabors.ImageSharp.Formats.Tiff.Compression; using SixLabors.ImageSharp.IO; using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Metadata; @@ -80,7 +82,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff /// /// Gets or sets the compression implementation to use when decoding the image. /// - public TiffCompressionType CompressionType { get; set; } + public TiffDecoderCompressionType CompressionType { get; set; } /// /// Gets or sets the planar configuration type to use when decoding the image. diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs index 6db776039c..751ecf09e5 100644 --- a/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs +++ b/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; +using SixLabors.ImageSharp.Formats.Tiff.Compression; using SixLabors.ImageSharp.Metadata; using SixLabors.ImageSharp.Metadata.Profiles.Exif; using SixLabors.ImageSharp.Metadata.Profiles.Icc; @@ -323,38 +324,38 @@ namespace SixLabors.ImageSharp.Formats.Tiff { case TiffCompression.None: { - options.CompressionType = TiffCompressionType.None; + options.CompressionType = TiffDecoderCompressionType.None; break; } case TiffCompression.PackBits: { - options.CompressionType = TiffCompressionType.PackBits; + options.CompressionType = TiffDecoderCompressionType.PackBits; break; } case TiffCompression.Deflate: case TiffCompression.OldDeflate: { - options.CompressionType = TiffCompressionType.Deflate; + options.CompressionType = TiffDecoderCompressionType.Deflate; break; } case TiffCompression.Lzw: { - options.CompressionType = TiffCompressionType.Lzw; + options.CompressionType = TiffDecoderCompressionType.Lzw; break; } case TiffCompression.CcittGroup3Fax: { - options.CompressionType = TiffCompressionType.T4; + options.CompressionType = TiffDecoderCompressionType.T4; break; } case TiffCompression.Ccitt1D: { - options.CompressionType = TiffCompressionType.HuffmanRle; + options.CompressionType = TiffDecoderCompressionType.HuffmanRle; break; } diff --git a/tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs index 10f5819ac3..db802d7d7b 100644 --- a/tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs @@ -3,8 +3,7 @@ using System.IO; using SixLabors.ImageSharp.Formats.Png.Zlib; -using SixLabors.ImageSharp.Formats.Tiff; -using SixLabors.ImageSharp.Memory; +using SixLabors.ImageSharp.Formats.Tiff.Compression; using Xunit; namespace SixLabors.ImageSharp.Tests.Formats.Tiff @@ -22,7 +21,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff { using (Stream stream = CreateCompressedStream(data)) { - byte[] buffer = new byte[data.Length]; + var buffer = new byte[data.Length]; new DeflateTiffCompression(null).Decompress(stream, (int)stream.Length, buffer); diff --git a/tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs index 3a0ceae74a..5c9ef2d311 100644 --- a/tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs @@ -3,6 +3,7 @@ using System.IO; using SixLabors.ImageSharp.Formats.Tiff; +using SixLabors.ImageSharp.Formats.Tiff.Compression; using Xunit; namespace SixLabors.ImageSharp.Tests.Formats.Tiff diff --git a/tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs index c1cde94666..24820b906a 100644 --- a/tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.IO; -using SixLabors.ImageSharp.Formats.Tiff; +using SixLabors.ImageSharp.Formats.Tiff.Compression; using Xunit; namespace SixLabors.ImageSharp.Tests.Formats.Tiff diff --git a/tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs index b08648465b..de8e11f779 100644 --- a/tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs @@ -3,6 +3,7 @@ using System.IO; using SixLabors.ImageSharp.Formats.Tiff; +using SixLabors.ImageSharp.Formats.Tiff.Compression; using SixLabors.ImageSharp.Memory; using Xunit;