From cce1bf93d4dec21e2a54e4a83791d1a8e3cbf1e9 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 12 Oct 2017 09:48:45 +1100
Subject: [PATCH] Fix alpha channel and add inverted test

---
 src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs |  45 ++++++++++---------
 tests/ImageSharp.Tests/TestImages.cs         |   4 +-
 tests/Images/Input/Bmp/test8-inverted.bmp    | Bin 0 -> 9270 bytes
 tests/Images/Input/Bmp/test8.bmp             | Bin 0 -> 9270 bytes
 4 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 tests/Images/Input/Bmp/test8-inverted.bmp
 create mode 100644 tests/Images/Input/Bmp/test8.bmp

diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index e962d6df6f..39bab442f7 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -371,35 +371,36 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 padding = 4 - padding;
             }
 
-            byte[] row = new byte[arrayWidth + padding];
-            var color = default(TPixel);
-
-            var rgba = default(Rgba32);
-
-            for (int y = 0; y < height; y++)
+            using (var row = Buffer<byte>.CreateClean(arrayWidth + padding))
             {
-                int newY = Invert(y, height, inverted);
-                this.currentStream.Read(row, 0, row.Length);
-                int offset = 0;
-                Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
+                var color = default(TPixel);
+                var rgba = new Rgba32(0, 0, 0, 255);
 
-                // TODO: Could use PixelOperations here!
-                for (int x = 0; x < arrayWidth; x++)
+                for (int y = 0; y < height; y++)
                 {
-                    int colOffset = x * ppb;
+                    int newY = Invert(y, height, inverted);
+                    this.currentStream.Read(row.Array, 0, row.Length);
+                    int offset = 0;
+                    Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
 
-                    for (int shift = 0; shift < ppb && (x + shift) < width; shift++)
+                    // TODO: Could use PixelOperations here!
+                    for (int x = 0; x < arrayWidth; x++)
                     {
-                        int colorIndex = ((row[offset] >> (8 - bits - (shift * bits))) & mask) * 4;
-                        int newX = colOffset + shift;
+                        int colOffset = x * ppb;
 
-                        // Stored in b-> g-> r order.
-                        rgba.Bgr = Unsafe.As<byte, Bgr24>(ref colors[colorIndex]);
-                        color.PackFromRgba32(rgba);
-                        pixelRow[newX] = color;
-                    }
+                        for (int shift = 0; shift < ppb && (x + shift) < width; shift++)
+                        {
+                            int colorIndex = ((row[offset] >> (8 - bits - (shift * bits))) & mask) * 4;
+                            int newX = colOffset + shift;
 
-                    offset++;
+                            // Stored in b-> g-> r order.
+                            rgba.Bgr = Unsafe.As<byte, Bgr24>(ref colors[colorIndex]);
+                            color.PackFromRgba32(rgba);
+                            pixelRow[newX] = color;
+                        }
+
+                        offset++;
+                    }
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 948f519d4c..4a0d248e44 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -135,8 +135,10 @@ namespace SixLabors.ImageSharp.Tests
             public const string CoreHeader = "Bmp/BitmapCoreHeaderQR.bmp";
             public const string V5Header = "Bmp/BITMAPV5HEADER.bmp";
             public const string RLE = "Bmp/RunLengthEncoded.bmp";
+            public const string Bit8 = "Bmp/test8.bmp";
+            public const string Bit8Inverted = "Bmp/test8-inverted.bmp";
 
-            public static readonly string[] All = { Car, F, NegHeight, CoreHeader, V5Header, RLE };
+            public static readonly string[] All = { Car, F, NegHeight, CoreHeader, V5Header, RLE, Bit8, Bit8Inverted };
         }
 
         public static class Gif
diff --git a/tests/Images/Input/Bmp/test8-inverted.bmp b/tests/Images/Input/Bmp/test8-inverted.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..b0909ae6e5a7dcfc7482797ff25dde5fe1105219
GIT binary patch
literal 9270
zcmeI&jaOx37zOY>gb+dq;Ua_(k`QHt(2$Q1LI@#*5HdmtA%qY@K0*i~WP}hx2qA<J
zLJ0Y2_PI4{=8m=Y{sZ`}cK5dKTAkkacF%dw^Sm=>r6nRPEec5Dv)Rm?$;rtXh@N^O
zH1)9X_o%2SL`O#>CME{4v9XAYi$i>TJQ5NT5DJBmn3#y9q$DIKCnF^#1*xg2NKa2k
zMn(p*va*n!osFEF9OUNaA}=ow`T6-MC@4T-VIhi&icnl!jFOTPl$MsFtgH;><>jcT
zs6b_9C90~bP+eV(nwlEa*4Cn~t`7C}^=N2lKx1Pgnwpx>+}w<omKL<OwxX@A4ejmi
z=;-J`XJ;q6y1LNa-Ho1}9`yG1qOY$H{r&wI7#P6d;2?&EhA=!ljFFKMjE;_CY-|kU
z<Kvi^m;k3{dMY?!;W>)oV=NQL#4`y@hzTY(n9*b=g-K=7nG7b2$!2nxTqcjnX9}1?
zridwKN|;inj45X-m`bLKsb*@JTBeSvXBwDBrip20T9{U*jcI2(m`<jP>1KMEUZ#)f
zX9k!-W{4SPMwn4%j2UMpnCbEVKm7mfyU)+B^sF(*$kec-!Oyt#oUwz3nZ`2)&p*=k
z8g??CHl8<lj#h$mxAc_pg0Y>3oeiGnr5BBDHSA(MY4F-3ZKGjV;|b#>gV$*#xNb|2
z8!sDMYuL@;wO)F~NYk*p@tDDNhqRT3J&Z?<R}HS!lwi#!Jz~6OY^h<E!S$Z>y0L|Z
zJ&lJAt~sU6HSA?PWV~T;y{-i7b?HIlO=B|+dmCKyOK%yQYS_nkz~KFcw26j&jr)za
z4c@aU*w47nc*odS3+@#q-uFrG8XIZY-?-P{y{5FGh69XyjQ0%Qw<|c%xZ8N&*gy;F
z1kzo`2gdpu4l-DKkXUDs*3)pXai{U2!P<?2LyS9&kBoJ-phhI!ZhUO4qv244^(Ton
zCTVRAhZ(mSpBSv)DLCA?)%es{OAG3Q(k;ek#+n+AFj#|>SYMRZ&~T)2v+=pX8m@w)
zjGK%vjMcTEHZ0v}d}*wv;b?<(Xo<CDX;lr!7&jPS8LZ<gIM%q{_}W-S3;F`mb;dWw
z${LO{*o%<ZSCCfHaJ+G?@vXsLj)D`6YmD!V6}6xzBwcNMZ>*r<M1%b(i9IE0c?~BS
zR~bJT?B^*s*|^g9(O6Ck`hn6F#!tqw8cs3Tla$y`l$OzOs&TpTv%#LOg42x4j9-kU
zwV)R)U26PlET!RegMDd<y<}-g4QCja7{3|p>nk|ZxY+pJSVChDdLi5xu%L^KKa9mS
z9z2s@nVI1P&(Dg)y$KTc5lD+^)5j0bLGXtFXGglw_|xFt4rSi>r{*9y{yC8@F#a+Y
z)#i_%hYpXQn?e?JzVWxQh&KPdpZ7m-ZY1tck^V7eXu+T(&5m@Q!96Te<S+mCPjdke
C=X^#0

literal 0
HcmV?d00001

diff --git a/tests/Images/Input/Bmp/test8.bmp b/tests/Images/Input/Bmp/test8.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..3be9a2066d73f03f01402df1400e23e4e264b1d0
GIT binary patch
literal 9270
zcmeI&{aa*n9LDi`2_b|K!XShYk`Rp*LQ5V(2qA<JLdXgsgb+dqc?cnd5JCtcgb+dq
zA%r}%_ZjWAJNCNn`w!rC^`53*n$DSK=A7^6%$${xjEIaFAcgm4voM>1Sl&`7a=XAy
zOiT=7V`C8)7l-)xcqAkwATco!Nl8fvg+fS9PDV;f3Q|*3k(QQ*^z?LOW@aKQD+}Rp
z7&$pP$j!|~US1yZ^Yc+qP=Lb1LKGDhp}4phB_$;&EiFY^SsBX9%TZBLfy&BCR8>`>
zy1E)QH8rTMtwmj39qQ}r(a_L<#>Pf8H8r8Rxfv}jEog0RMO#}N+S}XF(b0j<&Q5f7
zb)mbv8$CTe=<V%AUtb^k`};94Fo40qK@1HIVR(2LBO@ai9UaBk*cisg$1yQ6fyv29
zOifKq?+fm*$UchW_js1T5?K-pv0%prdo-1$v2>QnvRIhquw0hM@>u~ZWJRo)m9SD)
z#>!a*t7KKIn$@scR>$gD18ZbWteLg2R@TPaSqJN6U96k+uwK^3`q=;*WJ7G2jj&NR
z#>UwMn`G15|NrLyXP<q(ex;|4XN+tO+Z%k1OV1kHX_#p|W$^t++E&93#*@Z#2H&HV
z;JsUV!g$`;M#GK<-{++ljIA~7WIS&0vq#!W!_LNI#)}3&r<LGyTYA)Z$=FiEE(SmA
zrI(Ei4Z9kT7(DKfw$QMf@v!lV!DBTgIA)U`GF~+{*D%ZA@t*XWv6+V5jRy@Lb4r_P
z*u!|hc-`Rfx)L0(OZOXZ7@KI=)8H|`^ro?~hP{mY44!XD8)?|vxYu~g;5nOueT;jI
zw~Y<8;9ODSd7t!-v4Mttjk^t=Yf9^D*w47jc-P>0yMq0VJB{~@^|WA}K)S<t-&j|}
z0S4C|B(5_^>u5O8xZU``;M$FXgN)mZ4~@08V2wz+)%eI*OT)ni*PkS=F-dD`IK;Tc
z_}Jk3oq|J+n~hJ5HMC%TP`b(Z)L31^VFuSAC9W?@t7$mgxY78`;2N%iBa9o2&y7{J
zU~O2s-uS{;MZ=K>*P$h@ElVqFILf%r_|o7yzJjBTYmKjrm9$_kAYEg8ZLFx_7=yD2
ziE{;M1r5g<R~z3LoaHDu&bZ3>)>vK(W<t`H#&^bY8jd$OkCHf3l9ttQf^miMy}@~&
zf)kC)jUS9<v|t`6U1t1fEUn=rgEL8q^F(PW4JR9y8b2AF=_)wIxWxF`SW*jS!P3RX
zFUArYPBl1}mN-k67T0i^agp(>!MVPI(~S#_-;BjH&Y=H=7Y5Al0^@gMQH>9t&9Ch2
zNWuLxqVd`UiPsTGi)ho2AK3@N9|D{i?R?`8gV%N_bGQGWeGokUS<%ij{xlZW=50S8
xI<oz|C}e);8h;rJY4e`@x&H%aN8|M=(%;4mE!gO2v!k73@ER5=`j;>G(;N!lc*y_&

literal 0
HcmV?d00001