Browse Source

do not register SystemDrawing reference encoders on linux

af/merge-core
Anton Firszov 8 years ago
parent
commit
416bae672b
  1. 7
      tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
  2. 1
      tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs

7
tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs

@ -58,16 +58,19 @@ namespace SixLabors.ImageSharp.Tests
); );
// Magick codecs should work on all platforms // Magick codecs should work on all platforms
IImageEncoder pngEncoder = IsWindows ? (IImageEncoder)SystemDrawingReferenceEncoder.Png : new PngEncoder();
IImageEncoder bmpEncoder = IsWindows ? (IImageEncoder)SystemDrawingReferenceEncoder.Bmp : new BmpEncoder();
cfg.ConfigureCodecs( cfg.ConfigureCodecs(
ImageFormats.Png, ImageFormats.Png,
MagickReferenceDecoder.Instance, MagickReferenceDecoder.Instance,
SystemDrawingReferenceEncoder.Png, pngEncoder,
new PngImageFormatDetector()); new PngImageFormatDetector());
cfg.ConfigureCodecs( cfg.ConfigureCodecs(
ImageFormats.Bmp, ImageFormats.Bmp,
SystemDrawingReferenceDecoder.Instance, SystemDrawingReferenceDecoder.Instance,
SystemDrawingReferenceEncoder.Bmp, bmpEncoder,
new BmpImageFormatDetector()); new BmpImageFormatDetector());
return cfg; return cfg;

1
tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs

@ -18,7 +18,6 @@ using Xunit.Abstractions;
namespace SixLabors.ImageSharp.Tests namespace SixLabors.ImageSharp.Tests
{ {
public class TestEnvironmentTests public class TestEnvironmentTests
{ {
public TestEnvironmentTests(ITestOutputHelper output) public TestEnvironmentTests(ITestOutputHelper output)

Loading…
Cancel
Save