Răsfoiți Sursa

Merge pull request #1793 from m123711/fix/animate-template-bug

fix: RuleAnimate uses full screenshot as template causing false animation-stable and invalid template
huangrunheng 2 luni în urmă
părinte
comite
7d81982681
2 a modificat fișierele cu 8 adăugiri și 2 ștergeri
  1. 1 1
      module/atom/animate.py
  2. 7 1
      module/atom/image.py

+ 1 - 1
module/atom/animate.py

@@ -55,7 +55,7 @@ class RuleAnimate(RuleImage):
         @return:
         """
         if self._last_image is None:
-            self._last_image = image
+            self._last_image = self.corp(image, self.roi_front)
             return False
 
         self._image = self._last_image

+ 7 - 1
module/atom/image.py

@@ -156,7 +156,10 @@ class RuleImage(RuleImageMallResourceMixin):
 
         if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
             logger.error(f"Template image is invalid: {mat.shape}")
-            return False  # 模板无效,匹配失败
+            return False  # 模板无效, 匹配失败
+        if mat.shape[0] > source.shape[0] or mat.shape[1] > source.shape[1]:
+            # 模板大于源图, 视为无效匹配(避免 matchTemplate 的异常行为)
+            return False
 
         res = cv2.matchTemplate(source, mat, cv2.TM_CCOEFF_NORMED)
         min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)  # 最小匹配度,最大匹配度,最小匹配度的坐标,最大匹配度的坐标
@@ -216,6 +219,9 @@ class RuleImage(RuleImageMallResourceMixin):
             # 跳过无效缩放
             if scaled_w < 10 or scaled_h < 10:
                 continue
+            # 缩放后仍大于源图则跳过该尺度(避免 matchTemplate 契约问题)
+            if scaled_w > source_w or scaled_h > source_h:
+                continue
 
             try:
                 scaled_mat = cv2.resize(mat, (scaled_w, scaled_h))