move homgraphyValid after findHomography

- rebuilding libs and improved github actions scripts
webarkit · May 15, 2024 · de1bfc8 · de1bfc8
1 parent 904d90e
commit de1bfc8
Show file tree

Hide file tree

Showing 9 changed files with 1,178 additions and 1,652 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         node:
-          - 16.x
+          - 20.x
 
     # Packages 'firefox' and 'chromium' are pre-installed.
     #

diff --git a/.github/workflows/build_opencv.yml b/.github/workflows/build_opencv.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
@@ -27,7 +27,7 @@ jobs:
             ${{ runner.os }}-node-
       - run: git submodule update --init
       - run: npm install
-      - run: docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) -e "EMSCRIPTEN=/emsdk/upstream/emscripten"  emscripten/emsdk:2.0.10 emcmake python3 ./opencv/platforms/js/build_js.py opencv_js --config="./opencv.webarkit_config.py" --build_wasm --cmake_option="-DBUILD_opencv_dnn=OFF"  --cmake_option="-DBUILD_opencv_objdetect=OFF" --cmake_option="-DBUILD_opencv_photo=OFF" --build_flags="-s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0"
+      - run: docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) -e "EMSCRIPTEN=/emsdk/upstream/emscripten"  emscripten/emsdk:3.1.26 emcmake python3 ./opencv/platforms/js/build_js.py opencv_js --config="./opencv.webarkit_config.py" --build_wasm --cmake_option="-DBUILD_opencv_dnn=OFF"  --cmake_option="-DBUILD_opencv_objdetect=OFF" --cmake_option="-DBUILD_opencv_photo=OFF" --build_flags="-s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0"
       - run: cp -r opencv_js/bin/opencv_js.js build
       - uses: actions/upload-artifact@v3
         with:

diff --git a/dist/build/opencv_js.js b/dist/build/opencv_js.js
diff --git a/dist/build/opencv_js.js.map b/dist/build/opencv_js.js.map
diff --git a/dist/src/Workers/Worker.js b/dist/src/Workers/Worker.js
diff --git a/dist/src/Workers/Worker.js.map b/dist/src/Workers/Worker.js.map
diff --git a/dist/webarkitCV.js b/dist/webarkitCV.js
diff --git a/src/Workers/Worker.ts b/src/Workers/Worker.ts
@@ -210,18 +210,16 @@ const track = async (msg: any) => {
 
   if (template_keypoints.length >= ValidPointTotal) {
     var homography = cv.findHomography(templateMat, frameMat, cv.RANSAC);
+    var valid;
+    if (homographyValid(homography) === true) {
+      var out = fill_output(cv, homography, valid);
+      console.log('output from', out);
+    }
     homography_transform = homography.data64F;
   } else {
     homography_transform = null;
   }
 
-  var valid;
-
-  if (homographyValid(homography) == true) {
-    var out = fill_output(cv, homography, valid);
-    console.log(out);
-  }
-
   noArray.delete();
   orb.delete();
   frame_keypoints_vector.delete();

diff --git a/types/build/opencv_js.d.ts b/types/build/opencv_js.d.ts
@@ -1,2 +1,2 @@
 export default cv;
-declare function cv(cv: any, ...args: any[]): any;
+declare function cv(cv: any): any;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ jobs: @@
         strategy:
           matrix:
             node:
-              - 16.x
+              - 20.x
         # Packages 'firefox' and 'chromium' are pre-installed.
         #
@@ Expand Down @@