# HG changeset patch # User Tess Snider # Date 2015-10-12 16:35:28 # Node ID 4ddfeff5045423c47142f29f2204e9aabac96814 # Parent 39e644616fcf42f65c2b0b6ade93b051513dbdb6 Fixed error that was causing upward-clipped colors to not properly trigger the error-checking for that case. Also, corrected warning message for that condition. diff --git a/MainWindow.cs b/MainWindow.cs --- a/MainWindow.cs +++ b/MainWindow.cs @@ -482,7 +482,7 @@ public partial class MainWindow : Gtk.Wi b = pixBytes[pixelStart + 2]; // 1.) Check if this is a dark pixel. - if ((r < 0x42) && (g < 0x42) && (b <= 0x42)) + if ((r < 0x46) && (g < 0x46) && (b < 0x46)) { // 2.) Check the pixel above it, // to see if it's from the papy texture. @@ -524,9 +524,9 @@ public partial class MainWindow : Gtk.Wi // Now we know where the color bars are. otherPixelStart = pixelStart + (redBarSpacing * stride); int pixelCount = 0; - while ((Math.Abs(pixBytes[otherPixelStart] - 0xA1) < colorTolerance) && - (Math.Abs(pixBytes[otherPixelStart + 1] - 0x04) < colorTolerance) && - (Math.Abs(pixBytes[otherPixelStart + 2] - 0x03) < colorTolerance)) + while ((pixBytes[otherPixelStart] > 0x9F) && + (pixBytes[otherPixelStart + 1] < 0x62) && + (pixBytes[otherPixelStart + 2] < 0x62)) { pixelCount++; // pixBytes[otherPixelStart] = 0x00; @@ -539,9 +539,9 @@ public partial class MainWindow : Gtk.Wi otherPixelStart = pixelStart + (greenBarSpacing * stride); pixelCount = 0; - while ((Math.Abs(pixBytes[otherPixelStart] - 0x04) < colorTolerance) && - (Math.Abs(pixBytes[otherPixelStart + 1] - 0xA1) < colorTolerance) && - (Math.Abs(pixBytes[otherPixelStart + 2] - 0x03) < colorTolerance)) + while ((pixBytes[otherPixelStart] < 0x62) && + (pixBytes[otherPixelStart + 1] > 0x9F) && + (pixBytes[otherPixelStart + 2] < 0x62)) { pixelCount++; // pixBytes[otherPixelStart] = 0x00; @@ -554,9 +554,9 @@ public partial class MainWindow : Gtk.Wi otherPixelStart = pixelStart + (blueBarSpacing * stride); pixelCount = 0; - while ((Math.Abs(pixBytes[otherPixelStart] - 0x04) < colorTolerance) && - (Math.Abs(pixBytes[otherPixelStart + 1] - 0x04) < colorTolerance) && - (Math.Abs(pixBytes[otherPixelStart + 2] - 0xA1) < colorTolerance)) + while ((pixBytes[otherPixelStart] < 0x62) && + (pixBytes[otherPixelStart + 1] < 0x62) && + (pixBytes[otherPixelStart + 2] > 0x9F)) { pixelCount++; // pixBytes[otherPixelStart] = 0x00; @@ -601,15 +601,15 @@ public partial class MainWindow : Gtk.Wi } if (reactedColor.Red == 255) { - warning = warning + "\nRed is too low."; + warning = warning + "\nRed is too high."; } if (reactedColor.Green == 255) { - warning = warning + "\nGreen is too low."; + warning = warning + "\nGreen is too high."; } if (reactedColor.Blue == 255) { - warning = warning + "\nBlue is too low."; + warning = warning + "\nBlue is too high."; } if (warning.Length != 0) diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ in the game. You can always find the available downloads, on [the download page](https://bitbucket.org/Malkyne/desert-paint-lab/downloads). -The most recent version is [T7 Release Candidate 1](https://bitbucket.org/Malkyne/desert-paint-lab/downloads/DesertPaintLab_T7_RC1.zip). +The most recent version is [T7 Release Candidate 2](https://bitbucket.org/Malkyne/desert-paint-lab/downloads/DesertPaintLab_T7_RC2.zip). This application should run under Mono on Mac, Linux, and Windows. If you are on Windows, and do not have Mono installed, you can install [GTK# for .NET](http://www.mono-project.com/download/#download-win),