From c25c34b4768a15f32f2c8c92b9b276d4f61df5ef Mon Sep 17 00:00:00 2001
From: popow <popow@gmx.de>
Date: Sat, 15 Dec 2018 17:20:48 +0100
Subject: [PATCH] added unit test for decoding OS2 bitmap with 16 bytes header

---
 .../Formats/Bmp/BmpDecoderTests.cs            |  30 +++++++++++++-----
 tests/Images/Input/Bmp/pal8os2v2-16.bmp       | Bin 0 -> 9246 bytes
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 tests/Images/Input/Bmp/pal8os2v2-16.bmp

diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
index 5f2de9f51e..dc858f9500 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
@@ -88,19 +88,33 @@ namespace SixLabors.ImageSharp.Tests
             }
         }
 
-        [Theory]
-        [MemberData(nameof(RatioFiles))]
-        public void Identify_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        [Fact]
+        public void DecodeOs22XShortHeader_VeryfyDimensions()
         {
+            string imagePath = @"Bmp/pal8os2v2-16.bmp";
             var testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
                 var decoder = new BmpDecoder();
-                IImageInfo image = decoder.Identify(Configuration.Default, stream);
-                ImageMetaData meta = image.MetaData;
-                Assert.Equal(xResolution, meta.HorizontalResolution);
-                Assert.Equal(yResolution, meta.VerticalResolution);
-                Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                using (Image<Rgba32> image = decoder.Decode<Rgba32>(Configuration.Default, stream))
+                {
+                    Assert.Equal(127, image.Width);
+                    Assert.Equal(64, image.Height);
+                }
+            }
+        }
+
+        [Fact]
+        public void IdentifyOs22XShortHeader_VeryfyDimensions()
+        {
+            string imagePath = @"Bmp/pal8os2v2-16.bmp";
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                IImageInfo imageInfo = Image.Identify(stream);
+                Assert.Equal(127, imageInfo.Width);
+                Assert.Equal(64, imageInfo.Height);
+                Assert.Equal(8, imageInfo.PixelType.BitsPerPixel);
             }
         }
     }
diff --git a/tests/Images/Input/Bmp/pal8os2v2-16.bmp b/tests/Images/Input/Bmp/pal8os2v2-16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..95a1d2345aa1dd29cd03b29d0ea50879e24be9e3
GIT binary patch
literal 9246
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
JfN{>U{tG?^9{2zN

literal 0
HcmV?d00001