SixLabors · JimBobSquarePants · Aug 19, 2017 · Jun 16, 2017 · Jun 18, 2017 · Jun 18, 2017
diff --git a/.gitignore b/.gitignore
@@ -202,7 +202,8 @@ FakesAssemblies/
 
 **/node_modules
 **/node_modules/*
-**/TestOutput
+**/Images/ActualOutput
+**/Images/ReferenceOutput
 
 # ASP.NET 5
 project.lock.json

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "tests/Images/External"]
+	path = tests/Images/External
+	url = https://github.com/antonfirsov/Imagesharp.Tests.Images.git
+	branch = jpeg-lab
diff --git a/.travis.yml b/.travis.yml
@@ -26,15 +26,15 @@ env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
-   - secure: "aim+fUyx7kDQQcAYV1mX16cvyFEYsxiW3y26xjmeuKzsOf6DIUK328pE8KnO50bMWhfVPjuW7jWc43jI+nbUeIW5018aFcjoOrEK2F8JvJ0UKtEo+ONchypJSXA2TSdL0iIlufMBepsmlBsSLkCwHCJYohYcueZV0u9NVPc3n282KLL8ItRZeSFG/cL/a2yrkFnTFhq9OtkUtP4CcVE7BOtzjfftNcn4Rup73e5JkLT7L9AZS7eCYkIYV0KRlT2pOa/FuOHlfP9NP+NVtd83GXUY2FKBsmN3EmrQgGDTfwfwcJjN5dqIqzkIXmLV8IKQ3aiW2//02pIe5VrdqHQG+EVMRcdpCWyKUkMj0g4rGYkqKCtVJojKtOR93ycOGUDc6+cMMoyn3J2qFydkp278dGWeLuwtGfD25fHXorqK1aL9/bGPcwdinrBmcwnuy1IECtuTkEfAPsb6O4nArnDsTEzeQxwa/MAicmpux//TNKgkQGqzCPeHKbl4vOfyyI6kCsf8edWv8fOSPvJUGvL14+/TZ6lY8S+30fosOmwMCe7xlbtcVlBVtOsKx/XUufrP2Vuptlc8INaq6++XtgpCoMLL0SJfBFQKZRmBGavv1Ztyf0aL6Qp303HKGTyXOEq2k18iJmukB6JcnEGVsaAyteGlruQIbPgHWbxhZSoJZPw="
+   - secure: "rjMvEMN9rpvIXqXqCAAKzbHyABzr7E4wPU/dYJ/mHBqlCccFpQrEXVVM1MfRFXYuWZSaIioknhLATZjT5xvIYpTNM6D57z4OTmqeRHhYm80="
 
 before_install:
       - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
 
 addons:
   coverity_scan:
     project:
-      name: "JimBobSquarePants/ImageSharp"
+      name: "SixLabors/ImageSharp"
       description: "Build submitted via Travis CI"
     notification_email: [email protected]
     build_command_prepend: "dotnet restore"

diff --git a/ImageSharp.sln b/ImageSharp.sln
@@ -49,9 +49,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7CC6
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvatarWithRoundedCorner", "samples\AvatarWithRoundedCorner\AvatarWithRoundedCorner.csproj", "{844FC582-4E78-4371-847D-EFD4D1103578}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChangeDefaultEncoderOptions", "samples\ChangeDefaultEncoderOptions\ChangeDefaultEncoderOptions.csproj", "{07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChangeDefaultEncoderOptions", "samples\ChangeDefaultEncoderOptions\ChangeDefaultEncoderOptions.csproj", "{07EE511D-4BAB-4323-BAFC-3AF2BF9366F0}"
 EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-# <img src="https://github.com/raw/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-256.png" alt="ImageSharp" width="52"/> ImageSharp
+# <img src="https://github.com/raw/SixLabors/ImageSharp/master/build/icons/imagesharp-logo-256.png" alt="ImageSharp" width="52"/> ImageSharp
 
 **ImageSharp** is a new, fully featured, fully managed, cross-platform, 2D graphics API designed to allow the processing of images without the use of `System.Drawing`. 
 
@@ -9,21 +9,21 @@ Built against .Net Standard 1.1 ImageSharp can be used in device, cloud, and emb
 >
 > Pre-release downloads are available from the [MyGet package repository](https://www.myget.org/gallery/imagesharp).
 
-[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/raw/JimBobSquarePants/ImageSharp/master/APACHE-2.0-LICENSE.txt)
-[![GitHub issues](https://img.shields.io/github/issues/JimBobSquarePants/ImageSharp.svg)](https://github.com/JimBobSquarePants/ImageSharp/issues)
-[![GitHub stars](https://img.shields.io/github/stars/JimBobSquarePants/ImageSharp.svg)](https://github.com/JimBobSquarePants/ImageSharp/stargazers)
-[![GitHub forks](https://img.shields.io/github/forks/JimBobSquarePants/ImageSharp.svg)](https://github.com/JimBobSquarePants/ImageSharp/network)
+[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/raw/SixLabors/ImageSharp/master/APACHE-2.0-LICENSE.txt)
+[![GitHub issues](https://img.shields.io/github/issues/SixLabors/ImageSharp.svg)](https://github.com/SixLabors/ImageSharp/issues)
+[![GitHub stars](https://img.shields.io/github/stars/SixLabors/ImageSharp.svg)](https://github.com/SixLabors/ImageSharp/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/SixLabors/ImageSharp.svg)](https://github.com/SixLabors/ImageSharp/network)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ImageSharp/General?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Twitter](https://img.shields.io/twitter/url/https/github.com/JimBobSquarePants/ImageSharp.svg?style=social)](https://twitter.com/intent/tweet?hashtags=imagesharp,dotnet,oss&text=ImageSharp.+A+new+cross-platform+2D+graphics+API+in+C%23&url=https%3a%2f%2fgithub.com%2fJimBobSquarePants%2fImageSharp&via=james_m_south)
+[![Twitter](https://img.shields.io/twitter/url/https/github.com/SixLabors/ImageSharp.svg?style=social)](https://twitter.com/intent/tweet?hashtags=imagesharp,dotnet,oss&text=ImageSharp.+A+new+cross-platform+2D+graphics+API+in+C%23&url=https%3a%2f%2fgithub.com%2fSixLabors%2fImageSharp&via=sixlabors)
 [![OpenCollective](https://opencollective.com/imagesharp/backers/badge.svg)](#backers) 
 [![OpenCollective](https://opencollective.com/imagesharp/sponsors/badge.svg)](#sponsors)
 
 
 
 |             |Build Status|Code Coverage|
 |-------------|:----------:|:-----------:|
-|**Linux/Mac**|[![Build Status](https://travis-ci.org/JimBobSquarePants/ImageSharp.svg)](https://travis-ci.org/JimBobSquarePants/ImageSharp)|[![Code coverage](https://codecov.io/gh/JimBobSquarePants/ImageSharp/branch/master/graph/badge.svg)](https://codecov.io/gh/JimBobSquarePants/ImageSharp)|
-|**Windows**  |[![Build Status](https://ci.appveyor.com/api/projects/status/hu6d1gdpxdw0q360/branch/master?svg=true)](https://ci.appveyor.com/project/JamesSouth/imagesharp/branch/master)|[![Code coverage](https://codecov.io/gh/JimBobSquarePants/ImageSharp/branch/master/graph/badge.svg)](https://codecov.io/gh/JimBobSquarePants/ImageSharp)|
+|**Linux/Mac**|[![Build Status](https://travis-ci.org/SixLabors/ImageSharp.svg)](https://travis-ci.org/SixLabors/ImageSharp)|[![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp/branch/master/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp)|
+|**Windows**  |[![Build Status](https://ci.appveyor.com/api/projects/status/m9pn907xdah3ca39/branch/master?svg=true)](https://ci.appveyor.com/project/six-labors/imagesharp/branch/master)|[![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp/branch/master/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp)|
 
 
 ### Installation
@@ -64,7 +64,7 @@ Alternatively on Linux you can use:
 To clone it locally click the "Clone in Windows" button above or run the following git commands.
 
 ```bash
-git clone https://github.com/JimBobSquarePants/ImageSharp
+git clone https://github.com/SixLabors/ImageSharp
 ```
 
 ### Features
@@ -121,7 +121,7 @@ For optimized access within a loop it is recommended that the following methods
 1. `image.GetRowSpan(y)`
 2. `image.GetRowSpan(x, y)`
 
-For advanced pixel format usage there are multiple [PixelFormat implementations](https://github.com/JimBobSquarePants/ImageSharp/tree/master/src/ImageSharp/PixelFormats) available allowing developers to implement their own color models in the same manner as Microsoft XNA Game Studio and MonoGame. 
+For advanced pixel format usage there are multiple [PixelFormat implementations](https://github.com/SixLabors/ImageSharp/tree/master/src/ImageSharp/PixelFormats) available allowing developers to implement their own color models in the same manner as Microsoft XNA Game Studio and MonoGame. 
 
 All in all this should allow image processing to be much more accessible to developers which has always been my goal from the start.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,10 +7,6 @@ skip_branch_with_pr: true
 init:
   - ps: iex ((new-object net.webclient).DownloadString('https://gist.githubusercontent.com/PureKrome/0f79e25693d574807939/raw/8cf3160c9516ef1f4effc825c0a44acc918a0b5a/appveyor-build-info.ps'))
 
-# temp work around - https://appveyor.statuspage.io/incidents/m2vdvw39kdk8
-hosts:
-  api.nuget.org: 93.184.221.200
-
 build_script:
 - cmd: build.cmd
 

diff --git a/src/ImageSharp/Common/Extensions/ListExtensions.cs b/src/ImageSharp/Common/Extensions/ListExtensions.cs
@@ -0,0 +1,48 @@
+// <copyright file="ListExtensions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp.Common.Extensions
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Encapsulates a series of time saving extension methods to the <see cref="T:System.Collections.Generic.List"/> class.
+    /// </summary>
+    internal static class ListExtensions
+    {
+        /// <summary>
+        /// Inserts an item at the given index automatically expanding the capacity if required.
+        /// </summary>
+        /// <typeparam name="T">The type of object within the list</typeparam>
+        /// <param name="list">The list</param>
+        /// <param name="index">The index</param>
+        /// <param name="item">The item to insert</param>
+        public static void SafeInsert<T>(this List<T> list, int index, T item)
+        {
+            if (index >= list.Count)
+            {
+                list.Add(item);
+            }
+            else
+            {
+                list[index] = item;
+            }
+        }
+
+        /// <summary>
+        /// Removes the last element from a list and returns that element. This method changes the length of the list.
+        /// </summary>
+        /// <typeparam name="T">The type of object within the list</typeparam>
+        /// <param name="list">The list</param>
+        /// <returns>The last element in the specified sequence.</returns>
+        public static T Pop<T>(this List<T> list)
+        {
+            int last = list.Count - 1;
+            T item = list[last];
+            list.RemoveAt(last);
+            return item;
+        }
+    }
+}
diff --git a/src/ImageSharp/Common/Extensions/StreamExtensions.cs b/src/ImageSharp/Common/Extensions/StreamExtensions.cs
@@ -27,7 +27,7 @@ public static void Skip(this Stream stream, int count)
 
             if (stream.CanSeek)
             {
-                stream.Position += count;
+                stream.Seek(count, SeekOrigin.Current); // Position += count;
             }
             else
             {

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
@@ -35,14 +35,14 @@ public sealed class Configuration
         private readonly ConcurrentDictionary<IImageFormat, IImageDecoder> mimeTypeDecoders = new ConcurrentDictionary<IImageFormat, IImageDecoder>();
 
         /// <summary>
-        /// The list of supported <see cref="IImageFormatDetector"/>s.
+        /// The list of supported <see cref="IImageFormat"/>s.
         /// </summary>
-        private readonly List<IImageFormatDetector> imageFormatDetectors = new List<IImageFormatDetector>();
+        private readonly ConcurrentBag<IImageFormat> imageFormats = new ConcurrentBag<IImageFormat>();
 
         /// <summary>
-        /// The list of supported <see cref="IImageFormat"/>s.
+        /// The list of supported <see cref="IImageFormatDetector"/>s.
         /// </summary>
-        private readonly HashSet<IImageFormat> imageFormats = new HashSet<IImageFormat>();
+        private ConcurrentBag<IImageFormatDetector> imageFormatDetectors = new ConcurrentBag<IImageFormatDetector>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Configuration" /> class.
@@ -140,7 +140,7 @@ public void AddImageFormat(IImageFormat format)
         /// </summary>
         /// <param name="extension">The extension to discover</param>
         /// <returns>The <see cref="IImageFormat"/> if found otherwise null</returns>
-        public IImageFormat FindFormatByFileExtensions(string extension)
+        public IImageFormat FindFormatByFileExtension(string extension)
         {
             return this.imageFormats.FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase));
         }
@@ -186,7 +186,7 @@ public void SetDecoder(IImageFormat imageFormat, IImageDecoder decoder)
         /// </summary>
         public void ClearImageFormatDetectors()
         {
-            this.imageFormatDetectors.Clear();
+            this.imageFormatDetectors = new ConcurrentBag<IImageFormatDetector>();
         }
 
         /// <summary>

diff --git a/src/ImageSharp/Formats/Bmp/BmpFormat.cs b/src/ImageSharp/Formats/Bmp/BmpFormat.cs
@@ -8,7 +8,7 @@ namespace ImageSharp.Formats
     using System.Collections.Generic;
 
     /// <summary>
-    /// Registers the image encoders, decoders and mime type detectors for the jpeg format.
+    /// Registers the image encoders, decoders and mime type detectors for the bmp format.
     /// </summary>
     internal sealed class BmpFormat : IImageFormat
     {

diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -157,6 +157,10 @@ public Image<TPixel> Decode(Stream stream)
                     }
 
                     nextFlag = stream.ReadByte();
+                    if (nextFlag == -1)
+                    {
+                        break;
+                    }
                 }
             }
             finally

diff --git a/src/ImageSharp/Formats/Gif/GifFormat.cs b/src/ImageSharp/Formats/Gif/GifFormat.cs
@@ -8,7 +8,7 @@ namespace ImageSharp.Formats
     using System.Collections.Generic;
 
     /// <summary>
-    /// Registers the image encoders, decoders and mime type detectors for the jpeg format.
+    /// Registers the image encoders, decoders and mime type detectors for the gif format.
     /// </summary>
     internal sealed class GifFormat : IImageFormat
     {

diff --git a/...ts/Jpeg/Components/Block8x8F.Generated.cs → ...ormats/Jpeg/Common/Block8x8F.Generated.cs b/...ts/Jpeg/Components/Block8x8F.Generated.cs → ...ormats/Jpeg/Common/Block8x8F.Generated.cs
@@ -5,7 +5,7 @@
 // ReSharper disable InconsistentNaming
 // <auto-generated />
 #pragma warning disable
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.Common
 {
 	using System.Numerics;
 	using System.Runtime.CompilerServices;

diff --git a/...ts/Jpeg/Components/Block8x8F.Generated.tt → ...ormats/Jpeg/Common/Block8x8F.Generated.tt b/...ts/Jpeg/Components/Block8x8F.Generated.tt → ...ormats/Jpeg/Common/Block8x8F.Generated.tt
@@ -14,7 +14,7 @@
 <#
 char[] coordz = {'X', 'Y', 'Z', 'W'};
 #>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.Common
 {
 	using System.Numerics;
 	using System.Runtime.CompilerServices;

diff --git a/...harp/Formats/Jpeg/Components/Block8x8F.cs → ...ageSharp/Formats/Jpeg/Common/Block8x8F.cs b/...harp/Formats/Jpeg/Components/Block8x8F.cs → ...ageSharp/Formats/Jpeg/Common/Block8x8F.cs
@@ -3,14 +3,15 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 // ReSharper disable InconsistentNaming
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.Common
 {
     using System;
-    using System.Buffers;
     using System.Numerics;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
+
     /// <summary>
     /// DCT code Ported from https://github.com/norishigefukushima/dct_simd
     /// </summary>

diff --git a/src/ImageSharp/Formats/Jpeg/UnzigData.cs → ...ageSharp/Formats/Jpeg/Common/UnzigData.cs b/src/ImageSharp/Formats/Jpeg/UnzigData.cs → ...ageSharp/Formats/Jpeg/Common/UnzigData.cs
diff --git a/...harp/Formats/Jpeg/Components/BlockQuad.cs → ...s/Jpeg/GolangPort/Components/BlockQuad.cs b/...harp/Formats/Jpeg/Components/BlockQuad.cs → ...s/Jpeg/GolangPort/Components/BlockQuad.cs
@@ -2,16 +2,20 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg.Components
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components
 {
+    using ImageSharp.Formats.Jpeg.Common;
+
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
-    /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Block8x8F"/> instances.
+    /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Common.Block8x8F"/> instances.
     /// Useful for decoder/encoder operations allocating a block for each Jpeg component.
     /// </summary>
     internal unsafe struct BlockQuad
     {
         /// <summary>
-        /// The value-type <see cref="float"/> buffer sized for 4 <see cref="Block8x8F"/> instances.
+        /// The value-type <see cref="float"/> buffer sized for 4 <see cref="Common.Block8x8F"/> instances.
         /// </summary>
         public fixed float Data[4 * Block8x8F.ScalarCount];
     }

diff --git a/...ImageSharp/Formats/Jpeg/Components/DCT.cs → ...Formats/Jpeg/GolangPort/Components/DCT.cs b/...ImageSharp/Formats/Jpeg/Components/DCT.cs → ...Formats/Jpeg/GolangPort/Components/DCT.cs
@@ -4,11 +4,13 @@
 // </copyright>
 // ReSharper disable InconsistentNaming
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
     /// Contains forward and inverse DCT implementations
     /// </summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ public static void Skip(this Stream stream, int count) @@
                 if (stream.CanSeek)
                 {
-                    stream.Position += count;
+                    stream.Seek(count, SeekOrigin.Current); // Position += count;
                 }
                 else
                 {
@@ Expand Down @@