v.1.11.0

foo123 · Oct 11, 2024 · 809c103 · 809c103
1 parent cc2dbab
commit 809c103
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/build/filter.js b/build/filter.js
@@ -2,7 +2,7 @@
 *
 *   FILTER.js
 *   @version: 1.11.0
-*   @built on 2024-10-11 12:04:06
+*   @built on 2024-10-11 18:32:07
 *   @dependencies: Asynchronous.js
 *
 *   JavaScript Image Processing Library
@@ -12,7 +12,7 @@
 *
 *   FILTER.js
 *   @version: 1.11.0
-*   @built on 2024-10-11 12:04:06
+*   @built on 2024-10-11 18:32:07
 *   @dependencies: Asynchronous.js
 *
 *   JavaScript Image Processing Library
@@ -20342,7 +20342,7 @@ function ncc(x, y, sat1, sat2, avgt, vart, basis, w, h, tw, th, sc, ro, kk, tws0
     }*/
     // not convert from template rotation to image rotation (ie opposite of template rotation)
     var tws = tws0, ths = ths0, tws2, ths2, roa = stdMath.abs(ro),
-        x0, y0, x1, y1, bk, k, K = basis.length,
+        x0, y0, x1, y1, bk, c0, c1, k, K = basis.length,
         area, areat, areak, sum1, sum2, diff,
         avgf, varf, /*vart,*/ varft, cc, f,
         is_tilted = !(0 === roa || 90 === roa || 180 === roa || 270 === roa);
@@ -20447,8 +20447,9 @@ function ncc(x, y, sat1, sat2, avgt, vart, basis, w, h, tw, th, sc, ro, kk, tws0
         }
         //vart.v *= area;
         cc = (((varft)/stdMath.sqrt(varf*vart.v*area)) || 0);
-        if (cc <= stdMath.abs(vart.c0 || 0)) return 0;
-        cc = (cc /*- (vart.c0 || 0)*/)/(vart.c ? (vart.c /*- (vart.c0||0)*/) : 1);
+        c0 = vart.c0 || 0; c1 = vart.c || 0;
+        if (c0 < c1 && cc <= stdMath.abs(c0)) return 0;
+        cc = (cc/* - (c0)*/)/(c1 ? (c1/* - (c0)*/) : 1);
         if (1.01 < cc) cc = 0;
         return stdMath.min(stdMath.max(cc, -1), 1);
     }

diff --git a/build/filter.min.js b/build/filter.min.js
diff --git a/readme.md b/readme.md
@@ -7,7 +7,7 @@
 This is a library for processing images/video in pure JavaScript using HTML5 features like `Canvas`, **Web Workers, WebAssembly and WebGL** or alternatives in Node.js (eg `CanvasLite`, `node-canvas`, `node-gl`, node `processes`).
 
 
-**version 1.11.0** (410 kB minified)
+**version 1.11.0** (409 kB minified)
 
 
 ### Contents

diff --git a/src/plugins/TemplateMatcher.js b/src/plugins/TemplateMatcher.js
@@ -376,7 +376,7 @@ function ncc(x, y, sat1, sat2, avgt, vart, basis, w, h, tw, th, sc, ro, kk, tws0
     }*/
     // not convert from template rotation to image rotation (ie opposite of template rotation)
     var tws = tws0, ths = ths0, tws2, ths2, roa = stdMath.abs(ro),
-        x0, y0, x1, y1, bk, k, K = basis.length,
+        x0, y0, x1, y1, bk, c0, c1, k, K = basis.length,
         area, areat, areak, sum1, sum2, diff,
         avgf, varf, /*vart,*/ varft, cc, f,
         is_tilted = !(0 === roa || 90 === roa || 180 === roa || 270 === roa);
@@ -481,8 +481,9 @@ function ncc(x, y, sat1, sat2, avgt, vart, basis, w, h, tw, th, sc, ro, kk, tws0
         }
         //vart.v *= area;
         cc = (((varft)/stdMath.sqrt(varf*vart.v*area)) || 0);
-        if (cc <= stdMath.abs(vart.c0 || 0)) return 0;
-        cc = (cc /*- (vart.c0 || 0)*/)/(vart.c ? (vart.c /*- (vart.c0||0)*/) : 1);
+        c0 = vart.c0 || 0; c1 = vart.c || 0;
+        if (c0 < c1 && cc <= stdMath.abs(c0)) return 0;
+        cc = (cc/* - (c0)*/)/(c1 ? (c1/* - (c0)*/) : 1);
         if (1.01 < cc) cc = 0;
         return stdMath.min(stdMath.max(cc, -1), 1);
     }