diff --git a/data/image-test-data/aardvark_rgb_16_none.tif b/data/image-test-data/aardvark_rgb_16_none.tif new file mode 100644 index 0000000..f6dcb0a Binary files /dev/null and b/data/image-test-data/aardvark_rgb_16_none.tif differ diff --git a/data/image-test-data/aardvark_rgba_16_zip.tiff b/data/image-test-data/aardvark_rgba_16_zip.tiff new file mode 100644 index 0000000..94d5276 Binary files /dev/null and b/data/image-test-data/aardvark_rgba_16_zip.tiff differ diff --git a/data/image-test-data/aardvark_rgba_32.exr b/data/image-test-data/aardvark_rgba_32.exr new file mode 100644 index 0000000..1a328d9 Binary files /dev/null and b/data/image-test-data/aardvark_rgba_32.exr differ diff --git a/data/image-test-data/aardvark_rgba_32_lzw.tiff b/data/image-test-data/aardvark_rgba_32_lzw.tiff new file mode 100644 index 0000000..4e7c5ab Binary files /dev/null and b/data/image-test-data/aardvark_rgba_32_lzw.tiff differ diff --git a/data/image-test-data/aardvark_rgba_32_zip.tiff b/data/image-test-data/aardvark_rgba_32_zip.tiff new file mode 100644 index 0000000..960d1ba Binary files /dev/null and b/data/image-test-data/aardvark_rgba_32_zip.tiff differ diff --git a/data/image-test-data/aardvark_rgba_8.tiff b/data/image-test-data/aardvark_rgba_8.tiff new file mode 100644 index 0000000..4cbeee7 Binary files /dev/null and b/data/image-test-data/aardvark_rgba_8.tiff differ diff --git a/data/image-test-data/aardvark_rgba_8_lzw.tiff b/data/image-test-data/aardvark_rgba_8_lzw.tiff new file mode 100644 index 0000000..af21250 Binary files /dev/null and b/data/image-test-data/aardvark_rgba_8_lzw.tiff differ diff --git a/data/image-test-data/aardvark_rgba_8_none.tiff b/data/image-test-data/aardvark_rgba_8_none.tiff new file mode 100644 index 0000000..740eaae Binary files /dev/null and b/data/image-test-data/aardvark_rgba_8_none.tiff differ diff --git a/data/image-test-data/aardvark_rgba_8_zip.tiff b/data/image-test-data/aardvark_rgba_8_zip.tiff new file mode 100644 index 0000000..6434d16 Binary files /dev/null and b/data/image-test-data/aardvark_rgba_8_zip.tiff differ diff --git a/data/image-test-data/test_16.tif b/data/image-test-data/test_16.tif new file mode 100644 index 0000000..370e33d Binary files /dev/null and b/data/image-test-data/test_16.tif differ diff --git a/data/image-test-data/test_16.tiff b/data/image-test-data/test_16.tiff new file mode 100644 index 0000000..8f892bd Binary files /dev/null and b/data/image-test-data/test_16.tiff differ diff --git a/data/image-test-data/test_16_lzw.tiff b/data/image-test-data/test_16_lzw.tiff new file mode 100644 index 0000000..f29c23c Binary files /dev/null and b/data/image-test-data/test_16_lzw.tiff differ diff --git a/data/image-test-data/test_32.tiff b/data/image-test-data/test_32.tiff new file mode 100644 index 0000000..1fde626 Binary files /dev/null and b/data/image-test-data/test_32.tiff differ diff --git a/data/image-test-data/test_greyscale_16.tiff b/data/image-test-data/test_greyscale_16.tiff new file mode 100644 index 0000000..076109a Binary files /dev/null and b/data/image-test-data/test_greyscale_16.tiff differ diff --git a/data/image-test-data/test_uncomp_rgba_32f.tiff b/data/image-test-data/test_uncomp_rgba_32f.tiff new file mode 100644 index 0000000..1fde626 Binary files /dev/null and b/data/image-test-data/test_uncomp_rgba_32f.tiff differ diff --git a/paket.dependencies b/paket.dependencies index 817295b..d442310 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -7,7 +7,7 @@ nuget FSharp.Core >= 5.0.0 lowest_matching: true nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true nuget Aardvark.Build ~> 1.0.12 -nuget Aardvark.Base.Tensors ~> 5.2.4 +nuget Aardvark.Base.Tensors ~> 5.2.28 nuget System.Buffers >= 4.5.1 lowest_matching: true nuget System.Memory >= 4.5.5 lowest_matching: true @@ -19,7 +19,7 @@ group Test nuget FSharp.Core >= 5.0.0 lowest_matching: true - nuget Aardvark.PixImage.Devil ~> 5.2.4 + nuget Aardvark.PixImage.Devil ~> 5.2.28 nuget NUnit ~> 3.13.3 nuget FsUnit ~> 5.0.0 diff --git a/paket.lock b/paket.lock index d3ca658..df9d721 100644 --- a/paket.lock +++ b/paket.lock @@ -2,24 +2,24 @@ STORAGE: NONE RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Base (5.2.4) - Aardvark.Base.Telemetry (5.2.4) + Aardvark.Base (5.2.28) + Aardvark.Base.Telemetry (5.2.28) System.Collections.Immutable (>= 5.0) System.Reflection.Metadata (>= 5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) System.Text.Json (>= 4.7.2) - Aardvark.Base.FSharp (5.2.4) - Aardvark.Base (5.2.4) + Aardvark.Base.FSharp (5.2.28) + Aardvark.Base (5.2.28) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Telemetry (5.2.4) - Aardvark.Base.Tensors (5.2.4) - Aardvark.Base (5.2.4) - Aardvark.Base.FSharp (5.2.4) + Aardvark.Base.Telemetry (5.2.28) + Aardvark.Base.Tensors (5.2.28) + Aardvark.Base (5.2.28) + Aardvark.Base.FSharp (5.2.28) FSharp.Core (>= 5.0) - SixLabors.ImageSharp (>= 2.0 < 2.1) + SixLabors.ImageSharp (>= 2.1.3 < 2.2) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) Aardvark.Build (1.0.12) @@ -35,7 +35,7 @@ NUGET Microsoft.NETCore.Platforms (6.0.3) Microsoft.NETCore.Targets (5.0) Microsoft.NETFramework.ReferenceAssemblies (1.0) - SixLabors.ImageSharp (2.0) + SixLabors.ImageSharp (2.1.6) System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) @@ -106,7 +106,7 @@ NUGET System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.ObjectModel (4.3) System.Collections (>= 4.3) System.Diagnostics.Debug (>= 4.3) @@ -184,28 +184,28 @@ STORAGE: NONE RESTRICTION: == net6.0 NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Base (5.2.4) - Aardvark.Base.Telemetry (5.2.4) + Aardvark.Base (5.2.28) + Aardvark.Base.Telemetry (5.2.28) System.Collections.Immutable (>= 5.0) System.Text.Json (>= 4.7.2) - Aardvark.Base.FSharp (5.2.4) - Aardvark.Base (5.2.4) + Aardvark.Base.FSharp (5.2.28) + Aardvark.Base (5.2.28) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Telemetry (5.2.4) - Aardvark.Base.Tensors (5.2.4) - Aardvark.Base (5.2.4) - Aardvark.Base.FSharp (5.2.4) + Aardvark.Base.Telemetry (5.2.28) + Aardvark.Base.Tensors (5.2.28) + Aardvark.Base (5.2.28) + Aardvark.Base.FSharp (5.2.28) FSharp.Core (>= 5.0) - SixLabors.ImageSharp (>= 2.0 < 2.1) + SixLabors.ImageSharp (>= 2.1.3 < 2.2) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) - Aardvark.PixImage.Devil (5.2.4) - Aardvark.Base (5.2.4) - Aardvark.Base.Tensors (5.2.4) + Aardvark.PixImage.Devil (5.2.28) + Aardvark.Base (5.2.28) + Aardvark.Base.Tensors (5.2.28) DevILSharp BenchmarkDotNet (0.13.1) BenchmarkDotNet.Annotations (>= 0.13.1) @@ -313,7 +313,7 @@ NUGET NUnit3TestAdapter (4.2.1) Perfolizer (0.2.1) System.Memory (>= 4.5.3) - SixLabors.ImageSharp (2.0) + SixLabors.ImageSharp (2.1.6) System.Runtime.CompilerServices.Unsafe (>= 5.0) System.Text.Encoding.CodePages (>= 5.0) System.CodeDom (6.0) diff --git a/src/Aardvark.PixImage.FreeImage.Test/Aardvark.PixImage.FreeImage.Test.fsproj b/src/Aardvark.PixImage.FreeImage.Test/Aardvark.PixImage.FreeImage.Test.fsproj index f78612e..4f11c51 100644 --- a/src/Aardvark.PixImage.FreeImage.Test/Aardvark.PixImage.FreeImage.Test.fsproj +++ b/src/Aardvark.PixImage.FreeImage.Test/Aardvark.PixImage.FreeImage.Test.fsproj @@ -8,6 +8,7 @@ + diff --git a/src/Aardvark.PixImage.FreeImage.Test/Program.fs b/src/Aardvark.PixImage.FreeImage.Test/Program.fs index 2f00d36..18b25f0 100644 --- a/src/Aardvark.PixImage.FreeImage.Test/Program.fs +++ b/src/Aardvark.PixImage.FreeImage.Test/Program.fs @@ -92,6 +92,9 @@ module Program = [] let main argv = + //TiffTests.``[PixImage] Load TIFFs``() + //exit 0 + let cfg = let job = Job.Default.WithToolchain(InProcess.Emit.InProcessEmitToolchain.Instance) ManualConfig.Create(DefaultConfig.Instance).WithOptions(ConfigOptions.DisableOptimizationsValidator).AddJob(job)