Browse Source

Incorporate Tiff codec into new project structure

pull/1570/head
Andrew Wilkinson 9 years ago
parent
commit
254e70ad99
  1. 17
      ImageSharp.sln
  2. 11
      src/ImageSharp.Formats.Tiff/AssemblyInfo.cs
  3. 19
      src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj
  4. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
  5. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
  6. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
  7. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
  8. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
  9. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
  10. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
  11. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
  12. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
  13. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
  14. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs
  15. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs
  16. 0
      src/ImageSharp/Formats/Tiff/Constants/TiffType.cs
  17. 0
      src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs
  18. 0
      src/ImageSharp/Formats/Tiff/TiffDecoder.cs
  19. 0
      src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
  20. 0
      src/ImageSharp/Formats/Tiff/TiffEncoder.cs
  21. 0
      src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs
  22. 0
      src/ImageSharp/Formats/Tiff/TiffFormat.cs
  23. 0
      src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs
  24. 0
      src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs
  25. 3
      src/Shared/AssemblyInfo.Common.cs
  26. 12
      tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj

17
ImageSharp.sln

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Benchmarks", "te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Sandbox46", "tests\ImageSharp.Sandbox46\ImageSharp.Sandbox46.csproj", "{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}"
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(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -127,6 +129,18 @@ Global
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x64.Build.0 = Release|Any CPU
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x86.ActiveCfg = Release|Any CPU
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -139,5 +153,6 @@ Global
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
{2BF743D8-2A06-412D-96D7-F448F00C5EA5} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
{F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
EndGlobalSection
EndGlobal

11
src/ImageSharp.Formats.Tiff/AssemblyInfo.cs

@ -1,11 +0,0 @@
// <copyright file="AssemblyInfo.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
// Ensure the internals can be tested.
[assembly: InternalsVisibleTo("ImageSharp.Formats.Tiff.Tests")]

19
src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj

@ -1,19 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Buffers" Version="4.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.0.0" />
<PackageReference Include="System.Numerics.Vectors" Version="4.1.1" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.0.1" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\ImageSharp\**\*.cs" Exclude="..\ImageSharp\obj\**\*.cs" />
</ItemGroup>
</Project>

0
src/ImageSharp.Formats.Tiff/Constants/TiffCompression.cs → src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffConstants.cs → src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffExtraSamples.cs → src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffFillOrder.cs → src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffNewSubfileType.cs → src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffOrientation.cs → src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffPhotometricInterpretation.cs → src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffPlanarConfiguration.cs → src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffResolutionUnit.cs → src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffSubfileType.cs → src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffTags.cs → src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffThreshholding.cs → src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs

0
src/ImageSharp.Formats.Tiff/Constants/TiffType.cs → src/ImageSharp/Formats/Tiff/Constants/TiffType.cs

0
src/ImageSharp.Formats.Tiff/ITiffEncoderOptions.cs → src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs

0
src/ImageSharp.Formats.Tiff/TiffDecoder.cs → src/ImageSharp/Formats/Tiff/TiffDecoder.cs

0
src/ImageSharp.Formats.Tiff/TiffDecoderCore.cs → src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs

0
src/ImageSharp.Formats.Tiff/TiffEncoder.cs → src/ImageSharp/Formats/Tiff/TiffEncoder.cs

0
src/ImageSharp.Formats.Tiff/TiffEncoderOptions.cs → src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs

0
src/ImageSharp.Formats.Tiff/TiffFormat.cs → src/ImageSharp/Formats/Tiff/TiffFormat.cs

0
src/ImageSharp.Formats.Tiff/TiffIfd/TiffIfd.cs → src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs

0
src/ImageSharp.Formats.Tiff/TiffIfd/TiffIfdEntry.cs → src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs

3
src/Shared/AssemblyInfo.Common.cs

@ -37,4 +37,5 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("ImageSharp.Drawing")]
[assembly: InternalsVisibleTo("ImageSharp.Benchmarks")]
[assembly: InternalsVisibleTo("ImageSharp.Tests")]
[assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]
[assembly: InternalsVisibleTo("ImageSharp.Formats.Tiff.Tests")]
[assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]

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

@ -2,18 +2,18 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ImageSharp.Formats.Tiff\ImageSharp.Formats.Tiff.csproj" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170123-02" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<ProjectReference Include="..\..\src\ImageSharp\ImageSharp.csproj" />
</ItemGroup>
</Project>

Loading…
Cancel
Save