From 10b814c079280ce612f272b2d8ccf820f297b637 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Sun, 4 Mar 2018 21:20:35 +1100 Subject: [PATCH] Update codebase to catch up with changes to main repo. --- ImageSharp.sln | 50 ++----------------- .../Compression/DeflateTiffCompression.cs | 17 +++---- .../Tiff/Compression/LzwTiffCompression.cs | 15 ++---- .../Tiff/Compression/NoneTiffCompression.cs | 12 ++--- .../Compression/PackBitsTiffCompression.cs | 16 +++--- .../Tiff/Compression/TiffCompressionType.cs | 6 +-- .../Formats/Tiff/Constants/TiffCompression.cs | 6 +-- .../Formats/Tiff/Constants/TiffConstants.cs | 10 ++-- .../Tiff/Constants/TiffExtraSamples.cs | 6 +-- .../Formats/Tiff/Constants/TiffFillOrder.cs | 6 +-- .../Tiff/Constants/TiffNewSubfileType.cs | 10 ++-- .../Formats/Tiff/Constants/TiffOrientation.cs | 6 +-- .../TiffPhotometricInterpretation.cs | 6 +-- .../Tiff/Constants/TiffPlanarConfiguration.cs | 6 +-- .../Tiff/Constants/TiffResolutionUnit.cs | 6 +-- .../Formats/Tiff/Constants/TiffSubfileType.cs | 6 +-- .../Formats/Tiff/Constants/TiffTags.cs | 6 +-- .../Tiff/Constants/TiffThreshholding.cs | 6 +-- .../Formats/Tiff/Constants/TiffType.cs | 6 +-- .../Formats/Tiff/ITiffDecoderOptions.cs | 6 +-- .../Formats/Tiff/ITiffEncoderOptions.cs | 6 +-- .../Formats/Tiff/ImageExtensions.cs | 14 +++--- .../BlackIsZero1TiffColor.cs | 16 +++--- .../BlackIsZero4TiffColor.cs | 14 +++--- .../BlackIsZero8TiffColor.cs | 14 +++--- .../BlackIsZeroTiffColor.cs | 18 +++---- .../PaletteTiffColor.cs | 18 +++---- .../Rgb888TiffColor.cs | 16 +++--- .../RgbPlanarTiffColor.cs | 18 +++---- .../PhotometricInterpretation/RgbTiffColor.cs | 18 +++---- .../TiffColorType.cs | 6 +-- .../WhiteIsZero1TiffColor.cs | 16 +++--- .../WhiteIsZero4TiffColor.cs | 14 +++--- .../WhiteIsZero8TiffColor.cs | 14 +++--- .../WhiteIsZeroTiffColor.cs | 18 +++---- .../Formats/Tiff/TiffConfigurationModule.cs | 12 ++--- src/ImageSharp/Formats/Tiff/TiffDecoder.cs | 14 +++--- .../Formats/Tiff/TiffDecoderCore.cs | 24 ++++----- src/ImageSharp/Formats/Tiff/TiffEncoder.cs | 13 ++--- .../Formats/Tiff/TiffEncoderCore.cs | 37 ++++++-------- src/ImageSharp/Formats/Tiff/TiffFormat.cs | 12 ++--- .../Formats/Tiff/TiffIfd/TiffIfd.cs | 8 ++- .../Formats/Tiff/TiffIfd/TiffIfdEntry.cs | 8 ++- .../Tiff/TiffIfd/TiffIfdEntryCreator.cs | 15 +++--- .../Formats/Tiff/TiffImageFormatDetector.cs | 10 ++-- .../Formats/Tiff/TiffMetadataNames.cs | 6 +-- .../Formats/Tiff/Utils/BitReader.cs | 9 ++-- .../Formats/Tiff/Utils/SubStream.cs | 17 +++---- .../Formats/Tiff/Utils/TiffLzwDecoder.cs | 15 +++--- .../Formats/Tiff/Utils/TiffLzwEncoder.cs | 15 +++--- .../Formats/Tiff/Utils/TiffUtils.cs | 11 ++-- .../Formats/Tiff/Utils/TiffWriter.cs | 19 ++++--- src/Shared/AssemblyInfo.Common.cs | 2 - .../ImageSharp.Benchmarks/Image/DecodeTiff.cs | 21 ++++---- .../ImageSharp.Formats.Tiff.Tests.csproj | 20 -------- .../DeflateTiffCompressionTests.cs | 8 +-- .../Compression/LzwTiffCompressionTests.cs | 8 +-- .../Compression/NoneTiffCompressionTests.cs | 6 +-- .../PackBitsTiffCompressionTests.cs | 6 +-- .../BlackIsZeroTiffColorTests.cs | 6 +-- .../PaletteTiffColorTests.cs | 7 +-- .../PhotometricInterpretationTestBase.cs | 8 ++- .../RgbPlanarTiffColorTests.cs | 6 +-- .../RgbTiffColorTests.cs | 6 +-- .../WhiteIsZeroTiffColorTests.cs | 6 +-- .../Formats/Tiff/TiffDecoderHeaderTests.cs | 6 +-- .../Formats/Tiff/TiffDecoderIfdEntryTests.cs | 8 +-- .../Formats/Tiff/TiffDecoderIfdTests.cs | 6 +-- .../Formats/Tiff/TiffDecoderImageTests.cs | 6 +-- .../Formats/Tiff/TiffDecoderMetadataTests.cs | 7 +-- .../Formats/Tiff/TiffEncoderHeaderTests.cs | 10 ++-- .../Formats/Tiff/TiffEncoderIfdTests.cs | 8 ++- .../Formats/Tiff/TiffEncoderMetadataTests.cs | 12 ++--- .../Formats/Tiff/TiffFormatTests.cs | 7 +-- .../Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs | 10 ++-- .../Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs | 6 +-- .../Formats/Tiff/TiffIfd/TiffIfdTests.cs | 6 +-- .../Tiff/TiffImageFormatDetectorTests.cs | 6 +-- .../Formats/Tiff/Utils/SubStreamTests.cs | 6 +-- .../Formats/Tiff/Utils/TiffWriterTests.cs | 7 +-- .../ImageSharp.Tests/ImageSharp.Tests.csproj | 7 --- .../TestUtilities/ByteArrayUtility.cs | 6 +-- .../TestUtilities/ByteBuffer.cs | 6 +-- .../TestUtilities/Tiff/ITiffGenDataSource.cs | 6 +-- .../TestUtilities/Tiff/TiffGenDataBlock.cs | 6 +-- .../Tiff/TiffGenDataReference.cs | 6 +-- .../TestUtilities/Tiff/TiffGenEntry.cs | 6 +-- .../TestUtilities/Tiff/TiffGenExtensions.cs | 6 +-- .../TestUtilities/Tiff/TiffGenHeader.cs | 6 +-- .../TestUtilities/Tiff/TiffGenIfd.cs | 6 +-- .../Tiff/TiffGenIfdExtensions.cs | 6 +-- .../TestUtilities/Tiff/TiffIfdParser.cs | 9 ++-- 92 files changed, 357 insertions(+), 613 deletions(-) delete mode 100644 tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs (88%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/Compression/LzwTiffCompressionTests.cs (86%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/Compression/NoneTiffCompressionTests.cs (81%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs (89%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs (97%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs (89%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffDecoderHeaderTests.cs (95%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffDecoderIfdEntryTests.cs (99%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffDecoderIfdTests.cs (96%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffDecoderImageTests.cs (99%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffDecoderMetadataTests.cs (97%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffEncoderHeaderTests.cs (82%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffEncoderIfdTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffEncoderMetadataTests.cs (92%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffFormatTests.cs (75%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs (76%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffIfd/TiffIfdTests.cs (94%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/TiffImageFormatDetectorTests.cs (94%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/Utils/SubStreamTests.cs (98%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/Formats/Tiff/Utils/TiffWriterTests.cs (95%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/ByteArrayUtility.cs (77%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/ByteBuffer.cs (83%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/ITiffGenDataSource.cs (67%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenDataBlock.cs (81%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenDataReference.cs (72%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenEntry.cs (97%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenExtensions.cs (89%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenHeader.cs (88%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenIfd.cs (94%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffGenIfdExtensions.cs (81%) rename tests/{ImageSharp.Formats.Tiff.Tests => ImageSharp.Tests}/TestUtilities/Tiff/TiffIfdParser.cs (93%) diff --git a/ImageSharp.sln b/ImageSharp.sln index 51b63325b7..535e4d0846 100644 --- a/ImageSharp.sln +++ b/ImageSharp.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.3 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}" ProjectSection(SolutionItems) = preProject @@ -44,12 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Benchmarks", "te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Sandbox46", "tests\ImageSharp.Sandbox46\ImageSharp.Sandbox46.csproj", "{561B880A-D9EE-44EF-90F5-817C54A9D9AB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Formats.Tiff.Tests", "tests\ImageSharp.Formats.Tiff.Tests\ImageSharp.Formats.Tiff.Tests.csproj", "{F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}" -EndProject Global - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 @@ -107,42 +101,6 @@ Global {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x64.Build.0 = Release|Any CPU {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x86.ActiveCfg = Release|Any CPU {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x86.Build.0 = Release|Any CPU - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x64.ActiveCfg = Debug|x64 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x64.Build.0 = Debug|x64 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x86.ActiveCfg = Debug|x86 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x86.Build.0 = Debug|x86 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|Any CPU.Build.0 = Release|Any CPU - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x64.ActiveCfg = Release|x64 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x64.Build.0 = Release|x64 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x86.ActiveCfg = Release|x86 - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x86.Build.0 = Release|x86 - {844FC582-4E78-4371-847D-EFD4D1103578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Debug|Any CPU.Build.0 = Debug|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Debug|x64.ActiveCfg = Debug|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Debug|x64.Build.0 = Debug|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Debug|x86.ActiveCfg = Debug|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Debug|x86.Build.0 = Debug|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Release|Any CPU.ActiveCfg = Release|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Release|Any CPU.Build.0 = Release|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Release|x64.ActiveCfg = Release|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Release|x64.Build.0 = Release|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Release|x86.ActiveCfg = Release|Any CPU - {844FC582-4E78-4371-847D-EFD4D1103578}.Release|x86.Build.0 = Release|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Debug|x64.ActiveCfg = Debug|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Debug|x64.Build.0 = Debug|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Debug|x86.Build.0 = Debug|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Release|Any CPU.Build.0 = Release|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Release|x64.ActiveCfg = Release|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Release|x64.Build.0 = Release|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Release|x86.ActiveCfg = Release|Any CPU - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}.Release|x86.Build.0 = Release|Any CPU {561B880A-D9EE-44EF-90F5-817C54A9D9AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {561B880A-D9EE-44EF-90F5-817C54A9D9AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {561B880A-D9EE-44EF-90F5-817C54A9D9AB}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -165,12 +123,12 @@ Global {2E33181E-6E28-4662-A801-E2E7DC206029} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} {2BF743D8-2A06-412D-96D7-F448F00C5EA5} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} - {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} - {844FC582-4E78-4371-847D-EFD4D1103578} = {7CC6D57E-B916-43B8-B315-A0BB92F260A2} - {07EE511D-4BAB-4323-BAFC-3AF2BF9366F0} = {7CC6D57E-B916-43B8-B315-A0BB92F260A2} {561B880A-D9EE-44EF-90F5-817C54A9D9AB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F8B9D1F-CD8B-4CC5-8216-D531E25BD795} EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection EndGlobal diff --git a/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs index 1af8362a02..00d69dbd5c 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs @@ -1,16 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Buffers; - using System.IO; - using System.IO.Compression; - using System.Runtime.CompilerServices; +using System; +using System.IO; +using System.IO.Compression; +using System.Runtime.CompilerServices; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// 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 ae4d22a715..5de966554d 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs @@ -1,16 +1,11 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Buffers; - using System.IO; - using System.IO.Compression; - using System.Runtime.CompilerServices; +using System.IO; +using System.Runtime.CompilerServices; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// 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 6bc8a308fa..a9587d1990 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs @@ -1,13 +1,11 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.IO; - using System.Runtime.CompilerServices; +using System.IO; +using System.Runtime.CompilerServices; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// 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 0ac30e8f17..a6cd8f88d6 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs @@ -1,15 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Buffers; - using System.IO; - using System.Runtime.CompilerServices; +using System; +using System.Buffers; +using System.IO; +using System.Runtime.CompilerServices; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Class to handle cases where TIFF image data is compressed using PackBits compression. /// diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs index 3ea9270c87..4121f90b2d 100644 --- a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs +++ b/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Provides enumeration of the various TIFF compression types. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs index acb0685dbe..e5ee8b1952 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the compression formats defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs index cd88ccee73..a2044314ae 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs @@ -1,12 +1,10 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.Collections.Generic; +using System.Collections.Generic; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Defines constants defined in the TIFF specification. /// diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs index 545ae4c391..d34d999b95 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the possible uses of extra components in TIFF format files. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs index 7edf0eeaaf..e4d30a324d 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the fill orders defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs index 20bf16c636..b881ac209f 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs @@ -1,12 +1,10 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; +using System; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Enumeration representing the sub-file types defined by the Tiff file-format. /// diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs index 9ffa5cf81d..035f88809c 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the image orientations defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs index 35d1a291c3..dd4d923b8c 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the photometric interpretation formats defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs index ef0b722363..4fc0aa4c86 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing how the components of each pixel are stored the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs index 4bb7c15ba6..7bb3dbd6e3 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the resolution units defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs index 050af238c9..4039ae9e2d 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the sub-file types defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs index 7d93435154..38cf4280e1 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Constants representing tag IDs in the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs index 0e94443022..0a398d231b 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the threshholding applied to image data defined by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffType.cs index 1a1fc31083..8e55d80cc7 100644 --- a/src/ImageSharp/Formats/Tiff/Constants/TiffType.cs +++ b/src/ImageSharp/Formats/Tiff/Constants/TiffType.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Enumeration representing the data types understood by the Tiff file-format. diff --git a/src/ImageSharp/Formats/Tiff/ITiffDecoderOptions.cs b/src/ImageSharp/Formats/Tiff/ITiffDecoderOptions.cs index 9f45621349..c718102b8b 100644 --- a/src/ImageSharp/Formats/Tiff/ITiffDecoderOptions.cs +++ b/src/ImageSharp/Formats/Tiff/ITiffDecoderOptions.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats +namespace SixLabors.ImageSharp.Formats { /// /// Encapsulates the options for the . diff --git a/src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs b/src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs index eefb484c2b..e10396d5fc 100644 --- a/src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs +++ b/src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats +namespace SixLabors.ImageSharp.Formats { /// /// Encapsulates the options for the . diff --git a/src/ImageSharp/Formats/Tiff/ImageExtensions.cs b/src/ImageSharp/Formats/Tiff/ImageExtensions.cs index 470c09c727..3414f84d3b 100644 --- a/src/ImageSharp/Formats/Tiff/ImageExtensions.cs +++ b/src/ImageSharp/Formats/Tiff/ImageExtensions.cs @@ -1,14 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp -{ - using System.IO; - using Formats; - using ImageSharp.PixelFormats; +using System.IO; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp +{ /// /// Extension methods for the type. /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero1TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero1TiffColor.cs index a4de21874a..48a3a10980 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero1TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero1TiffColor.cs @@ -1,15 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'BlackIsZero' photometric interpretation (optimised for bilevel images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero4TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero4TiffColor.cs index 42d829ef80..5a9a0fc976 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero4TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero4TiffColor.cs @@ -1,14 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'BlackIsZero' photometric interpretation (optimised for 4-bit grayscale images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor.cs index b30cbe2643..d712e89bdb 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor.cs @@ -1,14 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'BlackIsZero' photometric interpretation (optimised for 8-bit grayscale images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor.cs index 18654f2710..5a8d633feb 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor.cs @@ -1,16 +1,14 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Numerics; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Numerics; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'BlackIsZero' photometric interpretation (for all bit depths). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor.cs index 4f4536331e..cc90aa405a 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor.cs @@ -1,16 +1,14 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Numerics; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Numerics; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'PaletteTiffColor' photometric interpretation (for all bit depths). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor.cs index a4c1c8ad5c..820c73d2a1 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor.cs @@ -1,16 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Numerics; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'RGB' photometric interpretation (optimised for 8-bit full color images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor.cs index bcd8e171b8..74c05fcd50 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor.cs @@ -1,16 +1,14 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Numerics; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Numerics; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'RGB' photometric interpretation with 'Planar' layout (for all bit depths). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor.cs index e62ee7dc93..51915de465 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor.cs @@ -1,16 +1,14 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Numerics; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Numerics; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'RGB' photometric interpretation (for all bit depths). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorType.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorType.cs index 36e00edf4b..7aea15885a 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorType.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorType.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Provides enumeration of the various TIFF photometric interpretation implementation types. diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero1TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero1TiffColor.cs index 25d01a2fb6..227aef5a4f 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero1TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero1TiffColor.cs @@ -1,15 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'WhiteIsZero' photometric interpretation (optimised for bilevel images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero4TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero4TiffColor.cs index 8aef89dc56..053f5165b3 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero4TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero4TiffColor.cs @@ -1,14 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'WhiteIsZero' photometric interpretation (optimised for 4-bit grayscale images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor.cs index 4697675105..74a1b2de97 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor.cs @@ -1,14 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'WhiteIsZero' photometric interpretation (optimised for 8-bit grayscale images). /// diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor.cs index 876ea87890..f85d858e7a 100644 --- a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor.cs +++ b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor.cs @@ -1,16 +1,14 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Numerics; - using System.Runtime.CompilerServices; - using ImageSharp; - using ImageSharp.PixelFormats; +using System; +using System.Numerics; +using System.Runtime.CompilerServices; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Implements the 'WhiteIsZero' photometric interpretation (for all bit depths). /// diff --git a/src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs b/src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs index 3e280ce839..868cbdef6c 100644 --- a/src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs +++ b/src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats +namespace SixLabors.ImageSharp.Formats { /// /// Registers the image encoders, decoders and mime type detectors for the TIFF format. @@ -13,9 +11,9 @@ namespace ImageSharp.Formats /// public void Configure(Configuration host) { - host.SetEncoder(ImageFormats.Tiff, new TiffEncoder()); - host.SetDecoder(ImageFormats.Tiff, new TiffDecoder()); - host.AddImageFormatDetector(new TiffImageFormatDetector()); + host.ImageFormatsManager.SetEncoder(ImageFormats.Tiff, new TiffEncoder()); + host.ImageFormatsManager.SetDecoder(ImageFormats.Tiff, new TiffDecoder()); + host.ImageFormatsManager.AddImageFormatDetector(new TiffImageFormatDetector()); } } } \ No newline at end of file diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoder.cs b/src/ImageSharp/Formats/Tiff/TiffDecoder.cs index 250b029152..1d4521b0b6 100644 --- a/src/ImageSharp/Formats/Tiff/TiffDecoder.cs +++ b/src/ImageSharp/Formats/Tiff/TiffDecoder.cs @@ -1,14 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats -{ - using System.IO; - using ImageSharp.Formats.Tiff; - using ImageSharp.PixelFormats; +using System.IO; + +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats +{ /// /// Image decoder for generating an image out of a TIFF stream. /// diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs index de42a03457..d9928c52e2 100644 --- a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs +++ b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs @@ -1,17 +1,17 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats -{ - using System; - using System.Buffers; - using System.IO; - using System.Text; - using ImageSharp.Formats.Tiff; - using ImageSharp.PixelFormats; +using System; +using System.Buffers; +using System.IO; +using System.Text; +using SixLabors.ImageSharp.Formats.Tiff; +using SixLabors.ImageSharp.MetaData; +using SixLabors.ImageSharp.MetaData.Profiles.Exif; +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats +{ /// /// Performs the tiff decoding operation. /// @@ -80,7 +80,7 @@ namespace ImageSharp.Formats public Stream InputStream { get; private set; } /// - /// A flag indicating if the file is encoded in little-endian or big-endian format. + /// Gets a value indicating whether the file is encoded in little-endian or big-endian format. /// public bool IsLittleEndian { get; private set; } diff --git a/src/ImageSharp/Formats/Tiff/TiffEncoder.cs b/src/ImageSharp/Formats/Tiff/TiffEncoder.cs index 6f84bd8523..63886a0751 100644 --- a/src/ImageSharp/Formats/Tiff/TiffEncoder.cs +++ b/src/ImageSharp/Formats/Tiff/TiffEncoder.cs @@ -1,14 +1,11 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats -{ - using System; - using System.IO; - using ImageSharp.PixelFormats; +using System.IO; +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats +{ /// /// Encoder for writing the data image to a stream in TIFF format. /// diff --git a/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs index d04b221d8b..6006984466 100644 --- a/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs +++ b/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs @@ -1,25 +1,16 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats -{ - using System; - using System.Buffers; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Runtime.CompilerServices; - using System.Text; - using ImageSharp.Formats.Tiff; - using ImageSharp.Memory; - using ImageSharp.PixelFormats; - - using Quantizers; - - using static ComparableExtensions; +using System; +using System.Collections.Generic; +using System.IO; +using SixLabors.ImageSharp.Formats.Tiff; +using SixLabors.ImageSharp.MetaData; +using SixLabors.ImageSharp.MetaData.Profiles.Exif; +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Formats +{ /// /// Performs the TIFF encoding operation. /// @@ -48,7 +39,7 @@ namespace ImageSharp.Formats /// Encodes the image to the specified stream from the . /// /// The pixel format. - /// The to encode from. + /// The to encode from. /// The to encode the image data to. public void Encode(Image image, Stream stream) where TPixel : struct, IPixel @@ -138,7 +129,7 @@ namespace ImageSharp.Formats /// /// The pixel format. /// The to write data to. - /// The to encode from. + /// The to encode from. /// The marker to write this IFD offset. /// The marker to write the next IFD offset (if present). public long WriteImage(TiffWriter writer, Image image, long ifdOffset) @@ -159,7 +150,7 @@ namespace ImageSharp.Formats /// Adds image metadata to the specified IFD. /// /// The pixel format. - /// The to encode from. + /// The to encode from. /// The metadata entries to add to the IFD. public void AddMetadata(Image image, List ifdEntries) where TPixel : struct, IPixel @@ -227,7 +218,7 @@ namespace ImageSharp.Formats /// Adds image format information to the specified IFD. /// /// The pixel format. - /// The to encode from. + /// The to encode from. /// The image format entries to add to the IFD. public void AddImageFormat(Image image, List ifdEntries) where TPixel : struct, IPixel diff --git a/src/ImageSharp/Formats/Tiff/TiffFormat.cs b/src/ImageSharp/Formats/Tiff/TiffFormat.cs index c12134c373..6c0279ab5e 100644 --- a/src/ImageSharp/Formats/Tiff/TiffFormat.cs +++ b/src/ImageSharp/Formats/Tiff/TiffFormat.cs @@ -1,13 +1,11 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats -{ - using System.Collections.Generic; - using ImageSharp.Formats.Tiff; +using System.Collections.Generic; +using SixLabors.ImageSharp.Formats.Tiff; +namespace SixLabors.ImageSharp.Formats +{ /// /// Encapsulates the means to encode and decode Tiff images. /// diff --git a/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs index f666f371d7..a6534c1558 100644 --- a/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs +++ b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Data structure for holding details of each TIFF IFD. @@ -21,7 +19,7 @@ namespace ImageSharp.Formats.Tiff public uint NextIfdOffset; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the struct. /// /// An array of the entries within the IFD. /// Offset (in bytes) to the next IFD, or zero if this is the last IFD. diff --git a/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs index d9c1722c85..de5974035c 100644 --- a/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs +++ b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff +namespace SixLabors.ImageSharp.Formats.Tiff { /// /// Data structure for holding details of each TIFF IFD entry. @@ -31,7 +29,7 @@ namespace ImageSharp.Formats.Tiff public byte[] Value; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the struct. /// /// The Tag ID for this entry. /// The data-type of this entry. diff --git a/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntryCreator.cs b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntryCreator.cs index c30ce5c8a4..bd9a529390 100644 --- a/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntryCreator.cs +++ b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntryCreator.cs @@ -1,14 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Collections.Generic; - using System.Text; +using System; +using System.Collections.Generic; +using System.Text; +using SixLabors.ImageSharp.MetaData.Profiles.Exif; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Utility class for generating TIFF IFD entries. /// diff --git a/src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs b/src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs index fd53080f55..447f523e93 100644 --- a/src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs +++ b/src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs @@ -1,12 +1,10 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats -{ - using System; +using System; +namespace SixLabors.ImageSharp.Formats +{ /// /// Detects tiff file headers /// diff --git a/src/ImageSharp/Formats/Tiff/TiffMetadataNames.cs b/src/ImageSharp/Formats/Tiff/TiffMetadataNames.cs index 4591986b00..10f558b29e 100644 --- a/src/ImageSharp/Formats/Tiff/TiffMetadataNames.cs +++ b/src/ImageSharp/Formats/Tiff/TiffMetadataNames.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats +namespace SixLabors.ImageSharp.Formats { /// /// Defines constants for each of the supported TIFF metadata types. diff --git a/src/ImageSharp/Formats/Tiff/Utils/BitReader.cs b/src/ImageSharp/Formats/Tiff/Utils/BitReader.cs index f330690f9f..cbd7256ed6 100644 --- a/src/ImageSharp/Formats/Tiff/Utils/BitReader.cs +++ b/src/ImageSharp/Formats/Tiff/Utils/BitReader.cs @@ -1,11 +1,8 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.IO; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Utility class to read a sequence of bits from an array /// diff --git a/src/ImageSharp/Formats/Tiff/Utils/SubStream.cs b/src/ImageSharp/Formats/Tiff/Utils/SubStream.cs index 3bab41edb1..aaf9af23a7 100644 --- a/src/ImageSharp/Formats/Tiff/Utils/SubStream.cs +++ b/src/ImageSharp/Formats/Tiff/Utils/SubStream.cs @@ -1,12 +1,11 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.IO; +using System; +using System.IO; + +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Utility class to encapsulate a sub-portion of another . /// @@ -22,7 +21,7 @@ namespace ImageSharp.Formats.Tiff private long length; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The underlying to wrap. /// The length of the sub-stream. @@ -39,7 +38,7 @@ namespace ImageSharp.Formats.Tiff } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The underlying to wrap. /// The offset of the sub-stream within the underlying . diff --git a/src/ImageSharp/Formats/Tiff/Utils/TiffLzwDecoder.cs b/src/ImageSharp/Formats/Tiff/Utils/TiffLzwDecoder.cs index f6ad7b3a43..6ac09f3916 100644 --- a/src/ImageSharp/Formats/Tiff/Utils/TiffLzwDecoder.cs +++ b/src/ImageSharp/Formats/Tiff/Utils/TiffLzwDecoder.cs @@ -1,14 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Buffers; - using System.IO; +using System; +using System.Buffers; +using System.IO; +using SixLabors.ImageSharp.Formats.Gif; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Decompresses and decodes data using the dynamic LZW algorithms. /// diff --git a/src/ImageSharp/Formats/Tiff/Utils/TiffLzwEncoder.cs b/src/ImageSharp/Formats/Tiff/Utils/TiffLzwEncoder.cs index 1ad7c3128c..e024b59fa4 100644 --- a/src/ImageSharp/Formats/Tiff/Utils/TiffLzwEncoder.cs +++ b/src/ImageSharp/Formats/Tiff/Utils/TiffLzwEncoder.cs @@ -1,14 +1,13 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Buffers; - using System.IO; +using System; +using System.Buffers; +using System.IO; +using SixLabors.ImageSharp.Formats.Gif; +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Encodes and compresses the image data using dynamic Lempel-Ziv compression. /// diff --git a/src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs b/src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs index 59b2491054..7842a71c1a 100644 --- a/src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs +++ b/src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs @@ -1,11 +1,10 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System.IO; +using System.IO; + +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// TIFF specific utilities and extension methods. /// diff --git a/src/ImageSharp/Formats/Tiff/Utils/TiffWriter.cs b/src/ImageSharp/Formats/Tiff/Utils/TiffWriter.cs index 201e7b4da3..5aa59c1082 100644 --- a/src/ImageSharp/Formats/Tiff/Utils/TiffWriter.cs +++ b/src/ImageSharp/Formats/Tiff/Utils/TiffWriter.cs @@ -1,13 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Formats.Tiff -{ - using System; - using System.Collections.Generic; - using System.IO; +using System; +using System.Collections.Generic; +using System.IO; + +namespace SixLabors.ImageSharp.Formats.Tiff +{ /// /// Utility class for writing TIFF data to a . /// @@ -27,12 +26,12 @@ namespace ImageSharp.Formats.Tiff } /// - /// Gets a flag indicating whether the architecture is little-endian. + /// Gets a value indicating whether the architecture is little-endian. /// public bool IsLittleEndian => BitConverter.IsLittleEndian; /// - /// Returns the current position within the stream. + /// Gets the current position within the stream. /// public long Position => this.output.Position; diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs index cf4077b709..327d3abd75 100644 --- a/src/Shared/AssemblyInfo.Common.cs +++ b/src/Shared/AssemblyInfo.Common.cs @@ -34,10 +34,8 @@ using System.Runtime.CompilerServices; // Ensure the internals can be built and tested. [assembly: InternalsVisibleTo("SixLabors.ImageSharp.Drawing")] [assembly: InternalsVisibleTo("ImageSharp.Benchmarks")] -[assembly: InternalsVisibleTo("ImageSharp.Formats.Tiff.Tests")] [assembly: InternalsVisibleTo("SixLabors.ImageSharp.Tests")] [assembly: InternalsVisibleTo("SixLabors.ImageSharp.Sandbox46")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKeyToken=null")] - diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeTiff.cs b/tests/ImageSharp.Benchmarks/Image/DecodeTiff.cs index 3c57e5fd22..fd02b9876f 100644 --- a/tests/ImageSharp.Benchmarks/Image/DecodeTiff.cs +++ b/tests/ImageSharp.Benchmarks/Image/DecodeTiff.cs @@ -1,19 +1,16 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Benchmarks.Image -{ - using System.Drawing; - using System.IO; - - using BenchmarkDotNet.Attributes; +using System.Drawing; +using System.IO; - using CoreImage = ImageSharp.Image; +using BenchmarkDotNet.Attributes; - using CoreSize = ImageSharp.Size; +using CoreImage = SixLabors.ImageSharp.Image; +using CoreSize = SixLabors.Primitives.Size; +namespace SixLabors.ImageSharp.Benchmarks.Image +{ public class DecodeTiff : BenchmarkBase { private byte[] tiffBytes; @@ -32,7 +29,7 @@ namespace ImageSharp.Benchmarks.Image { using (MemoryStream memoryStream = new MemoryStream(this.tiffBytes)) { - using (Image image = Image.FromStream(memoryStream)) + using (var image = System.Drawing.Image.FromStream(memoryStream)) { return image.Size; } diff --git a/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj b/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj deleted file mode 100644 index 5ecbcc5b90..0000000000 --- a/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Exe - netcoreapp1.1 - - - - - - - - - - - - - - - diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs similarity index 88% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs index 7021684d56..c739adcaf1 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.IO; using Xunit; @@ -11,6 +9,8 @@ namespace ImageSharp.Tests using ImageSharp.Formats; using ImageSharp.Formats.Tiff; + using SixLabors.ImageSharp.Formats.Png.Zlib; + public class DeflateTiffCompressionTests { [Theory] diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs similarity index 86% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs index e54d0dd5d1..3f379f8f6b 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs @@ -1,14 +1,10 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.IO; using Xunit; - - using ImageSharp.Formats; using ImageSharp.Formats.Tiff; public class LzwTiffCompressionTests diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs similarity index 81% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs index 40348cfed8..6f638cf9e2 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.IO; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs similarity index 89% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs index 85a7bd729f..b60524025e 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.IO; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs index 8c4f788462..a6692a4e06 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs similarity index 97% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs index 8a77c67f09..0470cb55ee 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs @@ -1,15 +1,12 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; using Xunit; using ImageSharp.Formats.Tiff; - using ImageSharp.PixelFormats; public class PaletteTiffColorTests : PhotometricInterpretationTestBase { diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs similarity index 89% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs rename to tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs index 7b36635738..0e18fd020a 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using Xunit; @@ -46,7 +44,7 @@ namespace ImageSharp.Tests int resultWidth = expectedResult[0].Length; int resultHeight = expectedResult.Length; Image image = new Image(resultWidth, resultHeight); - image.Fill(DefaultColor); + image.Mutate(x => x.Fill(DefaultColor)); using (PixelAccessor pixels = image.Lock()) { diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs index 2b06a8af51..abf8171d72 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs index 06122484bf..affb009c80 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs index e9d9556bd7..ff30862d2b 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs similarity index 95% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs index 43a349bac5..bde5c323b3 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.IO; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs similarity index 99% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs index 8cd7e4e9e9..0688129874 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.IO; @@ -13,6 +11,8 @@ namespace ImageSharp.Tests using ImageSharp.Formats; using ImageSharp.Formats.Tiff; + using SixLabors.ImageSharp.MetaData.Profiles.Exif; + public class TiffDecoderIfdEntryTests { [Theory] diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs similarity index 96% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs index fc557bf6f2..6accdf995e 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.IO; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderImageTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs similarity index 99% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderImageTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs index efb02f3183..9a17ffd867 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderImageTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.IO; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs similarity index 97% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs index 593733f731..e40822c735 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs @@ -1,11 +1,8 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { - using System; using System.IO; using System.Linq; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs similarity index 82% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs index 76d15f6a10..667d4e2324 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs @@ -1,18 +1,14 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { - using System; using System.IO; - using System.Linq; + using Xunit; using ImageSharp.Formats; using ImageSharp.Formats.Tiff; - using System.Text; public class TiffEncoderHeaderTests { diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderIfdTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderIfdTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs index c4c4fb84bf..c059a99daa 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderIfdTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.IO; @@ -12,7 +10,7 @@ namespace ImageSharp.Tests using ImageSharp.Formats; using ImageSharp.Formats.Tiff; - using System.Text; + using System.Collections.Generic; public class TiffEncoderIfdTests diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs similarity index 92% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs index 4dec7630cd..a9a2231268 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs @@ -1,19 +1,17 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { - using System; - using System.IO; - using System.Linq; using Xunit; using ImageSharp.Formats; using ImageSharp.Formats.Tiff; using System.Collections.Generic; + using SixLabors.ImageSharp.MetaData; + using SixLabors.ImageSharp.MetaData.Profiles.Exif; + public class TiffEncoderMetadataTests { public static object[][] BaselineMetadataValues = new[] { new object[] { TiffTags.Artist, TiffMetadataNames.Artist, "My Artist Name" }, diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs similarity index 75% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs index 09d90bb197..43428a0e99 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs @@ -1,11 +1,8 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { - using System.Linq; using Xunit; using ImageSharp.Formats; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs index 036ab46218..f9f3adfe8c 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs @@ -1,19 +1,17 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.Collections.Generic; - using System.IO; using System.Linq; using Xunit; - using ImageSharp.Formats; using ImageSharp.Formats.Tiff; + using SixLabors.ImageSharp.MetaData.Profiles.Exif; + public class TiffIfdEntryCreatorTests { [Theory] diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs similarity index 76% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs index efca357f9f..627042f42c 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs similarity index 94% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs index 26ec20963e..f6a3c90b77 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs similarity index 94% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs index c7b049e119..9800567f55 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Linq; using Xunit; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/SubStreamTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Utils/SubStreamTests.cs similarity index 98% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/SubStreamTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/Utils/SubStreamTests.cs index 34997a90cf..1f8f746641 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/SubStreamTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Utils/SubStreamTests.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.IO; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/TiffWriterTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/Utils/TiffWriterTests.cs similarity index 95% rename from tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/TiffWriterTests.cs rename to tests/ImageSharp.Tests/Formats/Tiff/Utils/TiffWriterTests.cs index 31582fb6d8..ce09cd72e9 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/TiffWriterTests.cs +++ b/tests/ImageSharp.Tests/Formats/Tiff/Utils/TiffWriterTests.cs @@ -1,11 +1,8 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { - using System; using System.IO; using Xunit; diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj index 878ce1a0d6..3261836c88 100644 --- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -13,13 +13,6 @@ - - - - - - - diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs b/tests/ImageSharp.Tests/TestUtilities/ByteArrayUtility.cs similarity index 77% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs rename to tests/ImageSharp.Tests/TestUtilities/ByteArrayUtility.cs index 0a3c9fc34e..dbe1d4755f 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ByteArrayUtility.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteBuffer.cs b/tests/ImageSharp.Tests/TestUtilities/ByteBuffer.cs similarity index 83% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteBuffer.cs rename to tests/ImageSharp.Tests/TestUtilities/ByteBuffer.cs index 290c942f8b..f646ab5bea 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteBuffer.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ByteBuffer.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.Collections.Generic; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs similarity index 67% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs index 75025f3e7a..3b84dbbc2a 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs similarity index 81% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs index 0b412f7feb..8764b4d516 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataReference.cs similarity index 72% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataReference.cs index 24d03bece1..f72f56b2ca 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataReference.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { /// /// A utility data structure to represent a reference from one block of data to another in a Tiff file. diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenEntry.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenEntry.cs similarity index 97% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenEntry.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenEntry.cs index 0cdfac5cba..cf4892edee 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenEntry.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenEntry.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.Collections.Generic; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenExtensions.cs similarity index 89% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenExtensions.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenExtensions.cs index 21c3b08443..cd1382c3b1 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenExtensions.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenExtensions.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.IO; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenHeader.cs similarity index 88% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenHeader.cs index 946faedf9e..e22128f772 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenHeader.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Collections.Generic; using System.Linq; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfd.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfd.cs similarity index 94% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfd.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfd.cs index ee560b18fe..4736a6fdf4 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfd.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfd.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.Collections.Generic; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs similarity index 81% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs index 4b62b9803f..e03f6ae3a7 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs @@ -1,9 +1,7 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System.Linq; diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffIfdParser.cs b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffIfdParser.cs similarity index 93% rename from tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffIfdParser.cs rename to tests/ImageSharp.Tests/TestUtilities/Tiff/TiffIfdParser.cs index f8d7440374..4fc8bca847 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffIfdParser.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tiff/TiffIfdParser.cs @@ -1,15 +1,16 @@ -// -// Copyright (c) James Jackson-South and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -// -namespace ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests { using System; using System.Collections.Generic; using System.Linq; using System.Text; using ImageSharp.Formats.Tiff; + + using SixLabors.ImageSharp.MetaData.Profiles.Exif; + using Xunit; ///