Browse Source

Update codebase to catch up with changes to main repo.

pull/1570/head
James Jackson-South 8 years ago
parent
commit
10b814c079
  1. 50
      ImageSharp.sln
  2. 17
      src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs
  3. 15
      src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs
  4. 12
      src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs
  5. 16
      src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs
  6. 6
      src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs
  7. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
  8. 10
      src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
  9. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
  10. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
  11. 10
      src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
  12. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
  13. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
  14. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
  15. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
  16. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
  17. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs
  18. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs
  19. 6
      src/ImageSharp/Formats/Tiff/Constants/TiffType.cs
  20. 6
      src/ImageSharp/Formats/Tiff/ITiffDecoderOptions.cs
  21. 6
      src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs
  22. 14
      src/ImageSharp/Formats/Tiff/ImageExtensions.cs
  23. 16
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero1TiffColor.cs
  24. 14
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero4TiffColor.cs
  25. 14
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor.cs
  26. 18
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor.cs
  27. 18
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor.cs
  28. 16
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor.cs
  29. 18
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor.cs
  30. 18
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor.cs
  31. 6
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorType.cs
  32. 16
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero1TiffColor.cs
  33. 14
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero4TiffColor.cs
  34. 14
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor.cs
  35. 18
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor.cs
  36. 12
      src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs
  37. 14
      src/ImageSharp/Formats/Tiff/TiffDecoder.cs
  38. 24
      src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
  39. 13
      src/ImageSharp/Formats/Tiff/TiffEncoder.cs
  40. 37
      src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
  41. 12
      src/ImageSharp/Formats/Tiff/TiffFormat.cs
  42. 8
      src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs
  43. 8
      src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs
  44. 15
      src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntryCreator.cs
  45. 10
      src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs
  46. 6
      src/ImageSharp/Formats/Tiff/TiffMetadataNames.cs
  47. 9
      src/ImageSharp/Formats/Tiff/Utils/BitReader.cs
  48. 17
      src/ImageSharp/Formats/Tiff/Utils/SubStream.cs
  49. 15
      src/ImageSharp/Formats/Tiff/Utils/TiffLzwDecoder.cs
  50. 15
      src/ImageSharp/Formats/Tiff/Utils/TiffLzwEncoder.cs
  51. 11
      src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs
  52. 19
      src/ImageSharp/Formats/Tiff/Utils/TiffWriter.cs
  53. 2
      src/Shared/AssemblyInfo.Common.cs
  54. 21
      tests/ImageSharp.Benchmarks/Image/DecodeTiff.cs
  55. 20
      tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj
  56. 8
      tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs
  57. 8
      tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs
  58. 6
      tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs
  59. 6
      tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs
  60. 6
      tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs
  61. 7
      tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs
  62. 8
      tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs
  63. 6
      tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs
  64. 6
      tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs
  65. 6
      tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs
  66. 6
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs
  67. 8
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs
  68. 6
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs
  69. 6
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs
  70. 7
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs
  71. 10
      tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs
  72. 8
      tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs
  73. 12
      tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs
  74. 7
      tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs
  75. 10
      tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs
  76. 6
      tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs
  77. 6
      tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs
  78. 6
      tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs
  79. 6
      tests/ImageSharp.Tests/Formats/Tiff/Utils/SubStreamTests.cs
  80. 7
      tests/ImageSharp.Tests/Formats/Tiff/Utils/TiffWriterTests.cs
  81. 7
      tests/ImageSharp.Tests/ImageSharp.Tests.csproj
  82. 6
      tests/ImageSharp.Tests/TestUtilities/ByteArrayUtility.cs
  83. 6
      tests/ImageSharp.Tests/TestUtilities/ByteBuffer.cs
  84. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs
  85. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs
  86. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataReference.cs
  87. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenEntry.cs
  88. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenExtensions.cs
  89. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenHeader.cs
  90. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfd.cs
  91. 6
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs
  92. 9
      tests/ImageSharp.Tests/TestUtilities/Tiff/TiffIfdParser.cs

50
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

17
src/ImageSharp/Formats/Tiff/Compression/DeflateTiffCompression.cs

@ -1,16 +1,13 @@
// <copyright file="DeflateTiffCompression.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Class to handle cases where TIFF image data is compressed using Deflate compression.
/// </summary>

15
src/ImageSharp/Formats/Tiff/Compression/LzwTiffCompression.cs

@ -1,16 +1,11 @@
// <copyright file="LzeTiffCompression.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Class to handle cases where TIFF image data is compressed using LZW compression.
/// </summary>

12
src/ImageSharp/Formats/Tiff/Compression/NoneTiffCompression.cs

@ -1,13 +1,11 @@
// <copyright file="NoneTiffCompression.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
{
using System.IO;
using System.Runtime.CompilerServices;
using System.IO;
using System.Runtime.CompilerServices;
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Class to handle cases where TIFF image data is not compressed.
/// </summary>

16
src/ImageSharp/Formats/Tiff/Compression/PackBitsTiffCompression.cs

@ -1,15 +1,13 @@
// <copyright file="PackBitsTiffCompression.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Class to handle cases where TIFF image data is compressed using PackBits compression.
/// </summary>

6
src/ImageSharp/Formats/Tiff/Compression/TiffCompressionType.cs

@ -1,9 +1,7 @@
// <copyright file="TiffCompressionType.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Provides enumeration of the various TIFF compression types.

6
src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs

@ -1,9 +1,7 @@
// <copyright file="TiffCompression.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the compression formats defined by the Tiff file-format.

10
src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs

@ -1,12 +1,10 @@
// <copyright file="TiffConstants.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
{
using System.Collections.Generic;
using System.Collections.Generic;
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Defines constants defined in the TIFF specification.
/// </summary>

6
src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs

@ -1,9 +1,7 @@
// <copyright file="TiffExtraSamples.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the possible uses of extra components in TIFF format files.

6
src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs

@ -1,9 +1,7 @@
// <copyright file="TiffFillOrder.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the fill orders defined by the Tiff file-format.

10
src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs

@ -1,12 +1,10 @@
// <copyright file="TiffNewSubfileType.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
{
using System;
using System;
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the sub-file types defined by the Tiff file-format.
/// </summary>

6
src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs

@ -1,9 +1,7 @@
// <copyright file="TiffOrientation.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the image orientations defined by the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs

@ -1,9 +1,7 @@
// <copyright file="TiffPhotometricInterpretation.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the photometric interpretation formats defined by the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs

@ -1,9 +1,7 @@
// <copyright file="TiffCompression.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing how the components of each pixel are stored the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs

@ -1,9 +1,7 @@
// <copyright file="TiffResolutionUnit.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the resolution units defined by the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs

@ -1,9 +1,7 @@
// <copyright file="TiffSubfileType.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the sub-file types defined by the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs

@ -1,9 +1,7 @@
// <copyright file="TiffTags.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Constants representing tag IDs in the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs

@ -1,9 +1,7 @@
// <copyright file="TiffThreshholding.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the threshholding applied to image data defined by the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/Constants/TiffType.cs

@ -1,9 +1,7 @@
// <copyright file="TiffType.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Enumeration representing the data types understood by the Tiff file-format.

6
src/ImageSharp/Formats/Tiff/ITiffDecoderOptions.cs

@ -1,9 +1,7 @@
// <copyright file="ITiffDecoderOptions.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Encapsulates the options for the <see cref="TiffDecoder"/>.

6
src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs

@ -1,9 +1,7 @@
// <copyright file="ITiffEncoderOptions.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Encapsulates the options for the <see cref="TiffEncoder"/>.

14
src/ImageSharp/Formats/Tiff/ImageExtensions.cs

@ -1,14 +1,12 @@
// <copyright file="ImageExtensions.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp
{
using System.IO;
using Formats;
using ImageSharp.PixelFormats;
using System.IO;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp
{
/// <summary>
/// Extension methods for the <see cref="Image{TPixel}"/> type.
/// </summary>

16
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero1TiffColor.cs

@ -1,15 +1,13 @@
// <copyright file="BlackIsZero1TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'BlackIsZero' photometric interpretation (optimised for bilevel images).
/// </summary>

14
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero4TiffColor.cs

@ -1,14 +1,12 @@
// <copyright file="BlackIsZero4TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'BlackIsZero' photometric interpretation (optimised for 4-bit grayscale images).
/// </summary>

14
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor.cs

@ -1,14 +1,12 @@
// <copyright file="BlackIsZero8TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'BlackIsZero' photometric interpretation (optimised for 8-bit grayscale images).
/// </summary>

18
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor.cs

@ -1,16 +1,14 @@
// <copyright file="BlackIsZeroTiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'BlackIsZero' photometric interpretation (for all bit depths).
/// </summary>

18
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor.cs

@ -1,16 +1,14 @@
// <copyright file="PaletteTiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'PaletteTiffColor' photometric interpretation (for all bit depths).
/// </summary>

16
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor.cs

@ -1,16 +1,12 @@
// <copyright file="Rgb888TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'RGB' photometric interpretation (optimised for 8-bit full color images).
/// </summary>

18
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor.cs

@ -1,16 +1,14 @@
// <copyright file="RgbTiffPlanarColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'RGB' photometric interpretation with 'Planar' layout (for all bit depths).
/// </summary>

18
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor.cs

@ -1,16 +1,14 @@
// <copyright file="RgbTiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'RGB' photometric interpretation (for all bit depths).
/// </summary>

6
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorType.cs

@ -1,9 +1,7 @@
// <copyright file="TiffColorType.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Provides enumeration of the various TIFF photometric interpretation implementation types.

16
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero1TiffColor.cs

@ -1,15 +1,13 @@
// <copyright file="WhiteIsZero1TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'WhiteIsZero' photometric interpretation (optimised for bilevel images).
/// </summary>

14
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero4TiffColor.cs

@ -1,14 +1,12 @@
// <copyright file="WhiteIsZero4TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'WhiteIsZero' photometric interpretation (optimised for 4-bit grayscale images).
/// </summary>

14
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor.cs

@ -1,14 +1,12 @@
// <copyright file="WhiteIsZero8TiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'WhiteIsZero' photometric interpretation (optimised for 8-bit grayscale images).
/// </summary>

18
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor.cs

@ -1,16 +1,14 @@
// <copyright file="WhiteIsZeroTiffColor.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Implements the 'WhiteIsZero' photometric interpretation (for all bit depths).
/// </summary>

12
src/ImageSharp/Formats/Tiff/TiffConfigurationModule.cs

@ -1,9 +1,7 @@
// <copyright file="TiffConfigurationModule.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Registers the image encoders, decoders and mime type detectors for the TIFF format.
@ -13,9 +11,9 @@ namespace ImageSharp.Formats
/// <inheritdoc/>
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());
}
}
}

14
src/ImageSharp/Formats/Tiff/TiffDecoder.cs

@ -1,14 +1,12 @@
// <copyright file="TiffDecoder.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
{
using System.IO;
using ImageSharp.Formats.Tiff;
using ImageSharp.PixelFormats;
using System.IO;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Image decoder for generating an image out of a TIFF stream.
/// </summary>

24
src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs

@ -1,17 +1,17 @@
// <copyright file="TiffDecoderCore.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Performs the tiff decoding operation.
/// </summary>
@ -80,7 +80,7 @@ namespace ImageSharp.Formats
public Stream InputStream { get; private set; }
/// <summary>
/// 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.
/// </summary>
public bool IsLittleEndian { get; private set; }

13
src/ImageSharp/Formats/Tiff/TiffEncoder.cs

@ -1,14 +1,11 @@
// <copyright file="TiffEncoder.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
{
using System;
using System.IO;
using ImageSharp.PixelFormats;
using System.IO;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Encoder for writing the data image to a stream in TIFF format.
/// </summary>

37
src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs

@ -1,25 +1,16 @@
// <copyright file="TiffEncoderCore.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Performs the TIFF encoding operation.
/// </summary>
@ -48,7 +39,7 @@ namespace ImageSharp.Formats
/// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode from.</param>
/// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
/// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
public void Encode<TPixel>(Image<TPixel> image, Stream stream)
where TPixel : struct, IPixel<TPixel>
@ -138,7 +129,7 @@ namespace ImageSharp.Formats
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="writer">The <see cref="BinaryWriter"/> to write data to.</param>
/// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode from.</param>
/// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
/// <param name="ifdOffset">The marker to write this IFD offset.</param>
/// <returns>The marker to write the next IFD offset (if present).</returns>
public long WriteImage<TPixel>(TiffWriter writer, Image<TPixel> image, long ifdOffset)
@ -159,7 +150,7 @@ namespace ImageSharp.Formats
/// Adds image metadata to the specified IFD.
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode from.</param>
/// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
/// <param name="ifdEntries">The metadata entries to add to the IFD.</param>
public void AddMetadata<TPixel>(Image<TPixel> image, List<TiffIfdEntry> ifdEntries)
where TPixel : struct, IPixel<TPixel>
@ -227,7 +218,7 @@ namespace ImageSharp.Formats
/// Adds image format information to the specified IFD.
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode from.</param>
/// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
/// <param name="ifdEntries">The image format entries to add to the IFD.</param>
public void AddImageFormat<TPixel>(Image<TPixel> image, List<TiffIfdEntry> ifdEntries)
where TPixel : struct, IPixel<TPixel>

12
src/ImageSharp/Formats/Tiff/TiffFormat.cs

@ -1,13 +1,11 @@
// <copyright file="TiffFormat.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
{
using System.Collections.Generic;
using ImageSharp.Formats.Tiff;
using System.Collections.Generic;
using SixLabors.ImageSharp.Formats.Tiff;
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Encapsulates the means to encode and decode Tiff images.
/// </summary>

8
src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs

@ -1,9 +1,7 @@
// <copyright file="TiffIfd.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Data structure for holding details of each TIFF IFD.
@ -21,7 +19,7 @@ namespace ImageSharp.Formats.Tiff
public uint NextIfdOffset;
/// <summary>
/// Initializes a new instance of the <see cref="TiffIfd" /> class.
/// Initializes a new instance of the <see cref="TiffIfd"/> struct.
/// </summary>
/// <param name="entries">An array of the entries within the IFD.</param>
/// <param name="nextIfdOffset">Offset (in bytes) to the next IFD, or zero if this is the last IFD.</param>

8
src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs

@ -1,9 +1,7 @@
// <copyright file="TiffIfdEntry.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Data structure for holding details of each TIFF IFD entry.
@ -31,7 +29,7 @@ namespace ImageSharp.Formats.Tiff
public byte[] Value;
/// <summary>
/// Initializes a new instance of the <see cref="TiffIfdEntry" /> class.
/// Initializes a new instance of the <see cref="TiffIfdEntry"/> struct.
/// </summary>
/// <param name="tag">The Tag ID for this entry.</param>
/// <param name="type">The data-type of this entry.</param>

15
src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntryCreator.cs

@ -1,14 +1,13 @@
// <copyright file="TiffIfdEntryCreator.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Utility class for generating TIFF IFD entries.
/// </summary>

10
src/ImageSharp/Formats/Tiff/TiffImageFormatDetector.cs

@ -1,12 +1,10 @@
// <copyright file="TiffImageFormatDetector.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
{
using System;
using System;
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Detects tiff file headers
/// </summary>

6
src/ImageSharp/Formats/Tiff/TiffMetadataNames.cs

@ -1,9 +1,7 @@
// <copyright file="TiffMetadataNames.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats
namespace SixLabors.ImageSharp.Formats
{
/// <summary>
/// Defines constants for each of the supported TIFF metadata types.

9
src/ImageSharp/Formats/Tiff/Utils/BitReader.cs

@ -1,11 +1,8 @@
// <copyright file="BitReader.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
{
using System.IO;
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Utility class to read a sequence of bits from an array
/// </summary>

17
src/ImageSharp/Formats/Tiff/Utils/SubStream.cs

@ -1,12 +1,11 @@
// <copyright file="SubStream.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
{
using System;
using System.IO;
using System;
using System.IO;
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// Utility class to encapsulate a sub-portion of another <see cref="Stream"/>.
/// </summary>
@ -22,7 +21,7 @@ namespace ImageSharp.Formats.Tiff
private long length;
/// <summary>
/// Initializes a new instance of the <see cref="Stream"/> class.
/// Initializes a new instance of the <see cref="SubStream"/> class.
/// </summary>
/// <param name="innerStream">The underlying <see cref="Stream"/> to wrap.</param>
/// <param name="length">The length of the sub-stream.</param>
@ -39,7 +38,7 @@ namespace ImageSharp.Formats.Tiff
}
/// <summary>
/// Initializes a new instance of the <see cref="Stream"/> class.
/// Initializes a new instance of the <see cref="SubStream"/> class.
/// </summary>
/// <param name="innerStream">The underlying <see cref="Stream"/> to wrap.</param>
/// <param name="offset">The offset of the sub-stream within the underlying <see cref="Stream"/>.</param>

15
src/ImageSharp/Formats/Tiff/Utils/TiffLzwDecoder.cs

@ -1,14 +1,13 @@
// <copyright file="TiffLzwDecoder.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Decompresses and decodes data using the dynamic LZW algorithms.
/// </summary>

15
src/ImageSharp/Formats/Tiff/Utils/TiffLzwEncoder.cs

@ -1,14 +1,13 @@
// <copyright file="TiffLzwEncoder.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Encodes and compresses the image data using dynamic Lempel-Ziv compression.
/// </summary>

11
src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs

@ -1,11 +1,10 @@
// <copyright file="TiffUtils.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Formats.Tiff
{
using System.IO;
using System.IO;
namespace SixLabors.ImageSharp.Formats.Tiff
{
/// <summary>
/// TIFF specific utilities and extension methods.
/// </summary>

19
src/ImageSharp/Formats/Tiff/Utils/TiffWriter.cs

@ -1,13 +1,12 @@
// <copyright file="TiffWriter.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{
/// <summary>
/// Utility class for writing TIFF data to a <see cref="Stream"/>.
/// </summary>
@ -27,12 +26,12 @@ namespace ImageSharp.Formats.Tiff
}
/// <summary>
/// Gets a flag indicating whether the architecture is little-endian.
/// Gets a value indicating whether the architecture is little-endian.
/// </summary>
public bool IsLittleEndian => BitConverter.IsLittleEndian;
/// <summary>
/// Returns the current position within the stream.
/// Gets the current position within the stream.
/// </summary>
public long Position => this.output.Position;

2
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")]

21
tests/ImageSharp.Benchmarks/Image/DecodeTiff.cs

@ -1,19 +1,16 @@
// <copyright file="DecodeTiff.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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;
}

20
tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj

@ -1,20 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0-preview1-25305-02" />
<PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ImageSharp\ImageSharp.csproj" />
<ProjectReference Include="..\..\src\ImageSharp.Drawing\ImageSharp.Drawing.csproj" />
</ItemGroup>
</Project>

8
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs → tests/ImageSharp.Tests/Formats/Tiff/Compression/DeflateTiffCompressionTests.cs

@ -1,9 +1,7 @@
// <copyright file="DeflateTiffCompressionTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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]

8
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs → tests/ImageSharp.Tests/Formats/Tiff/Compression/LzwTiffCompressionTests.cs

@ -1,14 +1,10 @@
// <copyright file="LzwTiffCompressionTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.IO;
using Xunit;
using ImageSharp.Formats;
using ImageSharp.Formats.Tiff;
public class LzwTiffCompressionTests

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs → tests/ImageSharp.Tests/Formats/Tiff/Compression/NoneTiffCompressionTests.cs

@ -1,9 +1,7 @@
// <copyright file="NoneTiffCompressionTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.IO;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs → tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs

@ -1,9 +1,7 @@
// <copyright file="PackBitsTiffCompressionTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.IO;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs

@ -1,9 +1,7 @@
// <copyright file="BlackIsZeroTiffColorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;
using Xunit;

7
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs

@ -1,15 +1,12 @@
// <copyright file="PaletteTiffColorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;
using Xunit;
using ImageSharp.Formats.Tiff;
using ImageSharp.PixelFormats;
public class PaletteTiffColorTests : PhotometricInterpretationTestBase
{

8
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs → tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs

@ -1,9 +1,7 @@
// <copyright file="PhotometricInterpretationTestBase.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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<Rgba32> image = new Image<Rgba32>(resultWidth, resultHeight);
image.Fill(DefaultColor);
image.Mutate(x => x.Fill(DefaultColor));
using (PixelAccessor<Rgba32> pixels = image.Lock())
{

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs

@ -1,9 +1,7 @@
// <copyright file="RgbPlanarTiffColorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs

@ -1,9 +1,7 @@
// <copyright file="RgbTiffColorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs

@ -1,9 +1,7 @@
// <copyright file="WhiteIsZeroTiffColorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffDecoderHeaderTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.IO;
using Xunit;

8
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffDecoderIfdEntryTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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]

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffDecoderIfdTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.IO;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderImageTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffDecoderImageTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.IO;

7
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs

@ -1,11 +1,8 @@
// <copyright file="TiffDecoderMetadataTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.IO;
using System.Linq;
using Xunit;

10
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs

@ -1,18 +1,14 @@
// <copyright file="TiffEncoderHeaderTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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
{

8
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderIfdTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffEncoderIfdTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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

12
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs

@ -1,19 +1,17 @@
// <copyright file="TiffEncoderMetadataTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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" },

7
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs

@ -1,11 +1,8 @@
// <copyright file="TiffFormatTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Linq;
using Xunit;
using ImageSharp.Formats;

10
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryCreatorTests.cs

@ -1,19 +1,17 @@
// <copyright file="TiffIfdEntryCreatorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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]

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdEntryTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffIfdEntryTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffIfd/TiffIfdTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffIfdTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs → tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs

@ -1,9 +1,7 @@
// <copyright file="TiffImageFormatDetectorTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Linq;
using Xunit;

6
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/SubStreamTests.cs → tests/ImageSharp.Tests/Formats/Tiff/Utils/SubStreamTests.cs

@ -1,9 +1,7 @@
// <copyright file="SubStreamTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.IO;

7
tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/Utils/TiffWriterTests.cs → tests/ImageSharp.Tests/Formats/Tiff/Utils/TiffWriterTests.cs

@ -1,11 +1,8 @@
// <copyright file="TiffWriterTests.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.IO;
using Xunit;

7
tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@ -13,13 +13,6 @@
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\tests\ImageSharp.Formats.Tiff.Tests\**\*.cs" Exclude="..\..\tests\ImageSharp.Formats.Tiff.Tests\obj\**\*.cs" />
<None Include="PixelFormats\PixelOperations.cs" />
<None Include="PixelFormats\PixelOperationsTests.Blender.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview1-26216-02" />
<PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-26216-02" />
<PackageReference Include="xunit" Version="2.3.1" />

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs → tests/ImageSharp.Tests/TestUtilities/ByteArrayUtility.cs

@ -1,9 +1,7 @@
// <copyright file="ByteArrayUtility.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteBuffer.cs → tests/ImageSharp.Tests/TestUtilities/ByteBuffer.cs

@ -1,9 +1,7 @@
// <copyright file="ByteBuffer.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.Collections.Generic;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs

@ -1,9 +1,7 @@
// <copyright file="ITiffGenDataSource.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenDataBlock.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenDataReference.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenDataReference.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
/// <summary>
/// A utility data structure to represent a reference from one block of data to another in a Tiff file.

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenEntry.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenEntry.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenEntry.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.Collections.Generic;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenExtensions.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenExtensions.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenExtensions.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.IO;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenHeader.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenHeader.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Collections.Generic;
using System.Linq;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfd.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfd.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenIfd.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System;
using System.Collections.Generic;

6
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffGenIfdExtensions.cs

@ -1,9 +1,7 @@
// <copyright file="TiffGenIfdExtensions.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
namespace ImageSharp.Tests
namespace SixLabors.ImageSharp.Tests
{
using System.Linq;

9
tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffIfdParser.cs → tests/ImageSharp.Tests/TestUtilities/Tiff/TiffIfdParser.cs

@ -1,15 +1,16 @@
// <copyright file="TiffIfdParser.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
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;
/// <summary>
Loading…
Cancel
Save