Merge branch 'master' into beta-1

.github/CONTRIBUTING.md

@@ -1,10 +1,10 @@
-# How to contribute to ImageSHarp
+# How to contribute to ImageSharp
 
 #### **Did you find a bug?**
 
-- Please **ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/JimBobSquarePants/ImageSharp/issues).
+- Please **ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/SixLabors/ImageSharp/issues).
 
-- If you're unable to find an open issue addressing the problem, please [open a new one](https://github.com/JimBobSquarePants/ImageSharp/issues/new). Be sure to include a **title, the applicable version, a clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring. Please do not hijack existing issues.
+- If you're unable to find an open issue addressing the problem, please [open a new one](https://github.com/SixLabors/ImageSharp/issues/new). Be sure to include a **title, the applicable version, a clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring. Please do not hijack existing issues.
 
 #### **Did you write a patch that fixes a bug?**
 

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 - [ ] I have written a descriptive issue title
 - [ ] I have verified that I am running the latest version of ImageSharp
 - [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
-- [ ] I have searched [open](https://github.com/JimBobSquarePants/ImageSharp/issuess) and [closed](https://github.com/JimBobSquarePants/ImageSharp/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
+- [ ] I have searched [open](https://github.com/SixLabors/ImageSharp/issues) and [closed](https://github.com/SixLabors/ImageSharp/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
 
 ### Description
 <!-- A description of the bug or feature -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ### Prerequisites
 
 - [ ] I have written a descriptive pull-request title
-- [ ] I have verified that there are no overlapping [pull-requests](https://github.com/JimBobSquarePants/ImageSharp/pulls) open
+- [ ] I have verified that there are no overlapping [pull-requests](https://github.com/SixLabors/ImageSharp/pulls) open
 - [ ] I have verified that I am following matches the existing coding patterns and practice as demonstrated in the repository. These follow strict Stylecop rules :cop:.
 - [ ] I have provided test coverage for my change (where applicable)
 

ImageSharp.sln

@@ -2,6 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,7 +15,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		features.md = features.md
 		ImageSharp.ruleset = ImageSharp.ruleset
 		ImageSharp.sln.DotSettings = ImageSharp.sln.DotSettings
+		.github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md
 		NuGet.config = NuGet.config
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
 		README.md = README.md
 	EndProjectSection
 EndProject

src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs

@@ -373,11 +373,18 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             // read header size
             this.currentStream.Read(data, 0, BmpInfoHeader.HeaderSizeSize);
             int headerSize = BitConverter.ToInt32(data, 0);
-            if (headerSize < BmpInfoHeader.HeaderSizeSize || headerSize > BmpInfoHeader.MaxHeaderSize)
+            if (headerSize < BmpInfoHeader.BitmapCoreHeaderSize)
             {
                 throw new NotSupportedException($"This kind of bitmap files (header size $headerSize) is not supported.");
             }
 
+            int skipAmmount = 0;
+            if (headerSize > BmpInfoHeader.MaxHeaderSize)
+            {
+                skipAmmount = headerSize - BmpInfoHeader.MaxHeaderSize;
+                headerSize = BmpInfoHeader.MaxHeaderSize;
+            }
+
             // read the rest of the header
             this.currentStream.Read(data, BmpInfoHeader.HeaderSizeSize, headerSize - BmpInfoHeader.HeaderSizeSize);
 
@@ -386,14 +393,23 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 case BmpInfoHeader.BitmapCoreHeaderSize:
                     this.infoHeader = this.ParseBitmapCoreHeader(data);
                     break;
-
                 case BmpInfoHeader.BitmapInfoHeaderSize:
                     this.infoHeader = this.ParseBitmapInfoHeader(data);
                     break;
-
                 default:
-                    throw new NotSupportedException($"This kind of bitmap files (header size $headerSize) is not supported.");
+                    if (headerSize > BmpInfoHeader.BitmapInfoHeaderSize)
+                    {
+                        this.infoHeader = this.ParseBitmapInfoHeader(data);
+                        break;
+                    }
+                    else
+                    {
+                        throw new NotSupportedException($"This kind of bitmap files (header size $headerSize) is not supported.");
+                    }
             }
+
+            // skip the remaining header because we can't read those parts
+            this.currentStream.Skip(skipAmmount);
         }
 
         /// <summary>

tests/ImageSharp.Tests/TestImages.cs

@@ -123,7 +123,9 @@ namespace SixLabors.ImageSharp.Tests
             public const string F = "Bmp/F.bmp";
             public const string NegHeight = "Bmp/neg_height.bmp";
             public const string CoreHeader = "Bmp/BitmapCoreHeaderQR.bmp";
-            public static readonly string[] All = { Car, F, NegHeight, CoreHeader };
+            public const string V5Header = "Bmp/BITMAPV5HEADER.bmp";
+            
+            public static readonly string[] All = { Car, F, NegHeight, CoreHeader, V5Header };
         }
 
         public static class Gif

tests/ImageSharp.Tests/TestImages/Formats/Bmp/BITMAPV5HEADER.bmp

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d99f80a05e0ddb6309c84846dfac7d2ef4e9cdda6ed437646bc0edfee7d3130
+size 174026