From 06ed5221c44ef3c085de212ebad6f14ab16e7a11 Mon Sep 17 00:00:00 2001 From: Andrew Wilkinson Date: Tue, 6 Jun 2017 21:11:01 +0100 Subject: [PATCH] Add TIFF as a default image format --- src/ImageSharp/Configuration.cs | 1 + .../Formats/Tiff/TiffDecoderHeaderTests.cs | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs index fa983d3557..57cd66eb43 100644 --- a/src/ImageSharp/Configuration.cs +++ b/src/ImageSharp/Configuration.cs @@ -109,6 +109,7 @@ namespace ImageSharp config.AddImageFormat(new Formats.JpegFormat()); config.AddImageFormat(new Formats.GifFormat()); config.AddImageFormat(new Formats.BmpFormat()); + config.AddImageFormat(new Formats.TiffFormat()); return config; } diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs index ae581d293b..0f03c32071 100644 --- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs +++ b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs @@ -68,7 +68,7 @@ namespace ImageSharp.Tests TiffDecoder decoder = new TiffDecoder(); - ImageFormatException e = Assert.Throws(() => { TestDecode(decoder, stream); }); + ImageFormatException e = Assert.Throws(() => { decoder.Decode(Configuration.Default, stream, null); }); Assert.Equal("Invalid TIFF file header.", e.Message); } @@ -86,7 +86,7 @@ namespace ImageSharp.Tests TiffDecoder decoder = new TiffDecoder(); - ImageFormatException e = Assert.Throws(() => { TestDecode(decoder, stream); }); + ImageFormatException e = Assert.Throws(() => { decoder.Decode(Configuration.Default, stream, null); }); Assert.Equal("Invalid TIFF file header.", e.Message); } @@ -103,15 +103,9 @@ namespace ImageSharp.Tests TiffDecoder decoder = new TiffDecoder(); - ImageFormatException e = Assert.Throws(() => { TestDecode(decoder, stream); }); + ImageFormatException e = Assert.Throws(() => { decoder.Decode(Configuration.Default, stream, null); }); Assert.Equal("Invalid TIFF file header.", e.Message); } - - private void TestDecode(TiffDecoder decoder, Stream stream) - { - Configuration.Default.AddImageFormat(new TiffFormat()); - Image image = decoder.Decode(Configuration.Default, stream, null); - } } } \ No newline at end of file