Fixed checkbox inconsistency error

I was just confusing some variables
organizedgrime · Feb 12, 2016 · 84ceaca · 84ceaca
1 parent 28de5d7
commit 84ceaca
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 57 deletions.
diff --git a/.vs/Steg/v14/.suo b/.vs/Steg/v14/.suo
diff --git a/Steg/DisplayOutput.cs b/Steg/DisplayOutput.cs
@@ -8,9 +8,10 @@ public partial class DisplayOutput : Form
         string mime;
         byte[] outputData;
 
-        public DisplayOutput(string outputStr = null, byte[] _outputData = null, bool trim = false)
+        public DisplayOutput(string outputStr = null, byte[] _outputData = null, bool trim = false, bool cut = false)
         {
             InitializeComponent();
+            MessageBox.Show("" + cut);
 
             // Transfer the temporary variable into the class level one.
             outputData = _outputData;

diff --git a/Steg/LSBForm.Designer.cs b/Steg/LSBForm.Designer.cs
diff --git a/Steg/LSBForm.cs b/Steg/LSBForm.cs
@@ -18,7 +18,6 @@ public LSBForm()
             filename2.Text = initialPath + "\\output.png";
             outputDirectory.Text = initialPath;
             fileInputFilename.Text = initialPath;
-
         }
 
 
@@ -91,7 +90,7 @@ private void retrieveInput_Click(object sender, EventArgs e)
 
         private void selectFileButton_Click(object sender, EventArgs e)
         {
-            LSBFunctions.readLSB(filename2.Text, Convert.ToInt32(bitCountRead.Value), concatBool.Checked, fileOutputBool.Checked, trimBool.Checked);
+            LSBFunctions.readLSB(filename2.Text, Convert.ToInt32(bitCountRead.Value), concatBool.Checked, fileOutputBool.Checked, concatBool.Checked, trimBool.Checked);
         }
 
         private void fileChooser2_Click(object sender, EventArgs e)

diff --git a/Steg/LSBFunctions.cs b/Steg/LSBFunctions.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 
 namespace Steg
@@ -74,7 +75,7 @@ public static void writeLSB(string filename, string outputDir, int bitCount, str
             bmp.Dispose();
         }
 
-        public static void readLSB(string filename, int bitCount, bool concat, bool fileout, bool trim)
+        public static void readLSB(string filename, int bitCount, bool concat, bool fileout, bool cut, bool trim)
         {
 
             openImg(filename);
@@ -102,7 +103,7 @@ public static void readLSB(string filename, int bitCount, bool concat, bool file
 
             if (fileout)
             {
-                dispOutput = new DisplayOutput(null, messageBytes, trim);
+                dispOutput = new DisplayOutput(null, messageBytes, trim, cut);
             }
             else
             {
@@ -127,7 +128,7 @@ public static void readLSB(string filename, int bitCount, bool concat, bool file
                 }
 
                 // Show the message
-                dispOutput = new DisplayOutput(str);
+                dispOutput = new DisplayOutput(str, null, false, cut);
             }
             dispOutput.Show();
         }
@@ -142,18 +143,21 @@ public static void readLSB(string filename, int bitCount, bool concat, bool file
 
         public static void openImg(string filename)
         {
-            bmp = new Bitmap(filename);
-            // Lock the bitmap's bits.  
-            Rectangle rect = new Rectangle(0, 0, bmp.Width, bmp.Height);
-            bmpData = bmp.LockBits(rect, ImageLockMode.ReadWrite, bmp.PixelFormat);
+            if (File.Exists(filename))
+            {
+                bmp = new Bitmap(filename);
+                // Lock the bitmap's bits.  
+                Rectangle rect = new Rectangle(0, 0, bmp.Width, bmp.Height);
+                bmpData = bmp.LockBits(rect, ImageLockMode.ReadWrite, bmp.PixelFormat);
 
-            // Get the address of the first line.
-            ptr = bmpData.Scan0;
+                // Get the address of the first line.
+                ptr = bmpData.Scan0;
 
-            bytes = Math.Abs(bmpData.Stride) * bmp.Height;
-            rgbValues = new byte[bytes];
+                bytes = Math.Abs(bmpData.Stride) * bmp.Height;
+                rgbValues = new byte[bytes];
 
-            System.Runtime.InteropServices.Marshal.Copy(ptr, rgbValues, 0, bytes);
+                System.Runtime.InteropServices.Marshal.Copy(ptr, rgbValues, 0, bytes);
+            }
         }
 
         public static void closeImg()