fixed #159 for the progressive case

SixLabors · Aug 31, 2017 · bc27c83 · bc27c83
1 parent b75481b
commit bc27c83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -52,6 +52,8 @@ public InputProcessor(Stream inputStream, byte[] temp)
         /// </summary>
         public bool ReachedEOF => this.LastErrorCode == OrigDecoderErrorCode.UnexpectedEndOfStream;
 
+        public bool HasError => this.LastErrorCode != OrigDecoderErrorCode.NoError;
+
         public OrigDecoderErrorCode LastErrorCode { get; private set; }
 
         public void ResetErrorState() => this.LastErrorCode = OrigDecoderErrorCode.NoError;

diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.cs
@@ -650,7 +650,7 @@ private int RefineNonZeroes(ref InputProcessor bp, int zig, int nz, int delta)
 
                 bool bit;
                 bp.DecodeBitUnsafe(out bit);
-                if (!bp.CheckEOFEnsureNoError())
+                if (bp.HasError)
                 {
                     return int.MinValue;
                 }

diff --git a/tests/Images/External b/tests/Images/External