Fixed findAll issues

glitchassassin · Jan 15, 2019 · 3684a5a · 3684a5a
1 parent 6b772e6
commit 3684a5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lackey/RegionMatching.py b/lackey/RegionMatching.py
@@ -570,6 +570,7 @@ def findAll(self, pattern):
         lastMatches = []
         for match in matches:
             position, confidence = match
+            position = ((position[0] + self.x, position[1] + self.y), (position[2], position[3]))
             lastMatches.append(
                 Match(
                     confidence,

diff --git a/lackey/TemplateMatchers.py b/lackey/TemplateMatchers.py
@@ -231,10 +231,7 @@ def findAllMatches(self, needle, similarity):
 
             # Erase the found match from the haystack.
             # Repeat this process until no other matches are found
-            x, y = best_match[0]
-            w = needle.shape[1]
-            h = needle.shape[0]
-            roi = (x, y, w, h)
+            roi = best_match[0]
             # numpy 2D slice
             roi_slice = (slice(roi[1], roi[1]+roi[3]), slice(roi[0], roi[0]+roi[2]))
             self.haystack[roi_slice] = 0