From 13165c402c6a12c397dbc9b7543711ee01791cfc Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 14 Feb 2018 12:24:54 +0000 Subject: [PATCH] Burned items print fine. --- EduNetworkBuilder/NetworkDevice.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index f632d0c..b79d4b7 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -727,7 +727,7 @@ namespace EduNetworkBuilder /*This overload copies data of /size/ into /data/ from location specified (/Scan0/)*/ System.Runtime.InteropServices.Marshal.Copy(bData.Scan0, OrigImagedata, 0, size); - System.Runtime.InteropServices.Marshal.Copy(bData.Scan0, BurnImagedata, 0, size); + System.Runtime.InteropServices.Marshal.Copy(burnData.Scan0, BurnImagedata, 0, size); for (int i = 0; i < size; i += bitsPerPixel / 8) { @@ -735,9 +735,14 @@ namespace EduNetworkBuilder if (OrigImagedata[i + 3] == 0) //If the original image is transparent, make the burn image transparent { BurnImagedata[i + 3] = 0;//Make it transparent + //Console.Write(" " + i); + } + else + { + //Console.Write("no"); } } - + Console.WriteLine(""); /* This override copies the data back into the location specified */ System.Runtime.InteropServices.Marshal.Copy(OrigImagedata, 0, bData.Scan0, OrigImagedata.Length); System.Runtime.InteropServices.Marshal.Copy(BurnImagedata, 0, burnData.Scan0, OrigImagedata.Length); @@ -745,7 +750,7 @@ namespace EduNetworkBuilder b.UnlockBits(bData); Burn.UnlockBits(burnData); - Graphics.FromImage(b).DrawImage(Burn,new Point(0,0)); + Graphics.FromImage(b).DrawImage(Burn, new Point(0,0)); return b; }