Browse Source

Merge branch 'master' into js/wu-quantizer

pull/393/head
James Jackson-South 8 years ago
committed by GitHub
parent
commit
ddbed2cbcc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  2. 1
      tests/ImageSharp.Tests/TestImages.cs
  3. 2
      tests/Images/External
  4. BIN
      tests/Images/Input/Jpg/issues/Issue394-MultiHuffmanBaseline-Speakers.jpg

1
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@ -42,6 +42,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
TestImages.Jpeg.Baseline.Jpeg444,
TestImages.Jpeg.Baseline.Bad.BadEOF,
TestImages.Jpeg.Baseline.Bad.ExifUndefType,
TestImages.Jpeg.Issues.MultiHuffmanBaseline394,
};
public static string[] ProgressiveTestJpegs =

1
tests/ImageSharp.Tests/TestImages.cs

@ -123,6 +123,7 @@ namespace SixLabors.ImageSharp.Tests
public const string MissingFF00ProgressiveGirl159 = "Jpg/issues/Issue159-MissingFF00-Progressive-Girl.jpg";
public const string BadCoeffsProgressive178 = "Jpg/issues/Issue178-BadCoeffsProgressive-Lemon.jpg";
public const string BadZigZagProgressive385 = "Jpg/issues/Issue385-BadZigZag-Progressive.jpg";
public const string MultiHuffmanBaseline394 = "Jpg/issues/Issue394-MultiHuffmanBaseline-Speakers.jpg";
}
public static readonly string[] All = Baseline.All.Concat(Progressive.All).ToArray();

2
tests/Images/External

@ -1 +1 @@
Subproject commit ab7c90362a4881c790c6f264f400dcf4b4dea0ce
Subproject commit dc5479d00b2312f691e6249b9f7765e2316d4a30

BIN
tests/Images/Input/Jpg/issues/Issue394-MultiHuffmanBaseline-Speakers.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 KiB

Loading…
Cancel
Save