File reading actually works now

itisrazza · Aug 30, 2019 · b6a4353 · b6a4353
1 parent d2d775c
commit b6a4353
Show file tree

Hide file tree

Showing 6 changed files with 355 additions and 50 deletions.
diff --git a/VGAPainter/MainForm.Designer.cs b/VGAPainter/MainForm.Designer.cs
diff --git a/VGAPainter/MainForm.cs b/VGAPainter/MainForm.cs
@@ -283,12 +283,12 @@ private void OpenImage_Click(object sender, EventArgs e)
             if (result != DialogResult.OK) return;
 
             // open the image
-            Stream file = new FileStream(saveTgr.FileName, FileMode.Open);
+            Stream file = new FileStream(openTgr.FileName, FileMode.Open);
             BinaryReader br = new BinaryReader(file, Encoding.ASCII);
 
             // first check the header
             char[] header = br.ReadChars(FileHeader.Length);
-            if (header != FileHeader.ToCharArray()) throw new Exception("Invalid format");
+            if (new string(header) != FileHeader) throw new Exception("Invalid format");
 
             // read the width and height
             bmWidth = br.ReadUInt16();
@@ -299,6 +299,8 @@ private void OpenImage_Click(object sender, EventArgs e)
 
             // done
             br.Close();
+
+            Redraw();
         }
 
         private void SaveImage_Click(object sender, EventArgs e)
@@ -352,6 +354,7 @@ private void DoMouse(int mouseX, int mouseY)
 
             // pre-calc image offset
             int offset = mouseY * bmWidth + mouseX;
+            if (offset < 0 || offset >= bmData.Length) return;
 
             switch (drawMode)
             {
@@ -408,7 +411,8 @@ private void CanvasBox_MouseLeave(object sender, EventArgs e)
 
         private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
         {
-
+            MessageBox.Show("VGAPainter by thegreatrazz\n" +
+                "https://github.com/thegreatrazz/VGAPainter");
         }
 
         private void Exit_Click(object sender, EventArgs e)