From 0422f0eb5a89159c4019ec9066d7bae9dbfc267c Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wizzup.org>
Date: Sat, 30 Jul 2011 15:53:48 +0200
Subject: [PATCH] MML/Core: Fixes for FindBitmapToleranceIn.

---
 Units/MMLCore/finder.pas | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Units/MMLCore/finder.pas b/Units/MMLCore/finder.pas
index 238b70a..ef487d7 100644
--- a/Units/MMLCore/finder.pas
+++ b/Units/MMLCore/finder.pas
@@ -107,7 +107,6 @@ uses
   tpa,              //TPABounds
   dtmutil;
 
-
 type
   TCTS0Info = record
       B, G, R, A: byte;
@@ -466,21 +465,24 @@ begin
 end;
 
 
-function Create_CTSInfo2DArray(cts, xs, ys, xe, ye: integer; bmp: TMufasaBitmap;
+function Create_CTSInfo2DArray(cts, w, h: integer; bmp: TMufasaBitmap;
     Tolerance: Integer; hueMod, satMod: Extended): TCTSInfo2DArray;
 var
-   x, y, w: integer;
+   x, y: integer;
+   data: PRGB32;
 begin
-  setlength(result,ye-ys+1,xe-xs+1);
-  w := bmp.width;
-  for y := ys to ye do
-    for x := xs to xe do
+  setlength(result,h+1,w+1);
+
+  data := bmp.fdata;
+
+  for y := 0 to h do
+    for x := 0 to w do
     begin
       { This is kinda ugly. We call RGBToColor() here only to call ColorToRGB()
         later again in Create_CTSInfo) }
-      result[y-ys][x-xs] := Create_CTSInfo(cts,
-          rgbtocolor(bmp.fdata[y*w+x].R, bmp.fdata[y*w+x].G,
-                     bmp.fdata[y*w+x].B),
+      result[y][x] := Create_CTSInfo(cts,
+          rgbtocolor(data[y*w+x].R, data[y*w+x].G,
+                     data[y*w+x].B),
           Tolerance, hueMod, satMod);
     end;
 end;
@@ -1670,7 +1672,7 @@ begin
   dX := dX - bmpW;
   dY := dY - bmpH;
 
-  ctsinfoarray := Create_CTSInfo2DArray(Self.CTS, xs, ys, xe, ye, bitmap,
+  ctsinfoarray := Create_CTSInfo2DArray(Self.CTS, bmpW, bmpH, bitmap,
       Tolerance, self.hueMod, self.satMod);
   compare := Get_CTSCompare(Self.CTS);