Merge pull request #130 from UrielCh/C++17

- use C++17 flag
- fix support for openCV 4.7.0, 4.8.0, 4.9.0

Author: UrielCh

.eslintrc

@@ -1,7 +1,15 @@
 {
+  "parser": "@typescript-eslint/parser",
+  // "parserOptions": {
+  //   "ecmaVersion": 2018,
+  //   "sourceType": "module",
+  //   "ecmaFeatures": {
+  //     "jsx": true
+  //   },
+  //   "project": "./tsconfig.json"
+  // },
   "ignorePatterns": [ "**/*.js" ],
   "root": true,
-  "parser": "@typescript-eslint/parser",
    "plugins": [
     "@typescript-eslint"
   ],
@@ -18,9 +26,17 @@
     "no-nested-ternary": 0,
     "no-async-promise-executor": 0,
     "radix": 0
+    // unit tests only
+    // "max-len" : 0,
+    // "no-new" : 0,
+    // "no-unused-expressions": 0,
+    // "prefer-spread": 0,
+    // "@typescript-eslint/ban-ts-comment": 0,
+    // "@typescript-eslint/no-explicit-any": 0
   },
   "env": {
     "es6": true,
     "node": true
+    // "mocha": true
   }
 }

.github/workflows/prebuild.yml

@@ -44,10 +44,12 @@ jobs:
     strategy:
       matrix:
         opencv_version:
-          # - 4.7.0 not available yet
+          - 4.9.0
+          - 4.8.0
+          - 4.7.0
           - 4.6.0
-          - 4.5.5 # 2019-12-23 ubuntu 22.04
-          - 4.5.1 # raspberry Pi version
+          # - 4.5.5 # 2019-12-23 ubuntu 22.04
+          ###- 4.5.1 # raspberry Pi version
           # - 4.2.0 # 2019-12-23 ubuntu 20.04
           # - 3.4.16
         node_version:

bin/install.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 const compileLib = require("../install/compileLib.js");
-compileLib.compileLib(process.argv);
+const {argv} = process;
+compileLib.compileLib(argv);

binding.gyp

@@ -120,14 +120,15 @@
 			"cc/highgui/highgui.cc",
 			"cc/highgui/highguiConstants.cc",
 		],
-
 		"cflags" : [
-			"-std=c++14"
+			"-std=c++17"
 		],
 		"cflags!" : [
+			"-std=c++17",
 			"-fno-exceptions"
 		],
 		"cflags_cc!": [
+			"-std=c++17",
 			"-fno-rtti",
 			"-fno-exceptions"
 		],
@@ -136,7 +137,7 @@
 		],
 		"xcode_settings": {
 			"OTHER_CFLAGS": [
-				"-std=c++14",
+				"-std=c++17",
 				"-stdlib=libc++"
 			],
 			"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
@@ -175,7 +176,6 @@
 				"cflags": ["--coverage"],
 				"ldflags": ["--coverage"]
 			},
-    }
-
+    	}
 	}]
 }

install/compileLib.js

@@ -333,8 +333,8 @@ or use OPENCV4NODEJS_* env variable.`);
                 `CV_VERSION_REVISION=${cvVersion[2]}`,
                 ...OPENCV4NODEJS_DEFINES
             ],
-            "cStandard": "c11",
-            "cppStandard": "c++11",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
             // "compilerArgs": [ "-std=c++11" ]
         };
         if (process.platform === 'win32') {
@@ -361,6 +361,10 @@ or use OPENCV4NODEJS_* env variable.`);
         console.log('');
     }
     else {
+        // for (const key in process.env) {
+        //     if (key.startsWith('OPENCV'))
+        //         console.log(`export ${key}=${process.env[key]}`);
+        // }
         const child = child_process.exec(nodegypCmd, { maxBuffer: Infinity, cwd }, function (error /*, stdout, stderr*/) {
             // fs.unlinkSync(realGyp);
             const bin = buildOptions.extra.electron ? 'electron-rebuild' : 'node-gyp';

install/compileLib.ts

@@ -360,8 +360,8 @@ or use OPENCV4NODEJS_* env variable.`)
                 `CV_VERSION_MINOR=${cvVersion[1]}`,
                 `CV_VERSION_REVISION=${cvVersion[2]}`,
                 ...OPENCV4NODEJS_DEFINES],
-            "cStandard": "c11",
-            "cppStandard": "c++11",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
             // "compilerArgs": [ "-std=c++11" ]
         }
         if (process.platform === 'win32') {
@@ -386,6 +386,10 @@ or use OPENCV4NODEJS_* env variable.`)
         console.log(nodegypCmd);
         console.log('');
     } else {
+        // for (const key in process.env) {
+        //     if (key.startsWith('OPENCV'))
+        //         console.log(`export ${key}=${process.env[key]}`);
+        // }
         const child = child_process.exec(nodegypCmd, { maxBuffer: Infinity, cwd }, function (error/*, stdout, stderr*/) {
             // fs.unlinkSync(realGyp);
             const bin = buildOptions.extra.electron ? 'electron-rebuild' : 'node-gyp';

package.json

@@ -39,10 +39,10 @@
     "build": "tsc --pretty --project .",
     "prepack": "npm run build",
     "install": "node bin/install.js auto",
-    "install_Mac": "CXXFLAGS=\"-std=c++14 -Wno-c++11-narrowing -Wno-c++17-extensions -Wno-c++17-attribute-extensions\" node ./bin/install.js --version 4.5.3 build",
+    "install_Mac": "CXXFLAGS=\"-std=c++17 -Wno-c++11-narrowing -Wno-c++17-extensions -Wno-c++17-attribute-extensions\" node ./bin/install.js --version 4.5.3 build",
     "install_default": "node bin/install.js rebuild",
     "install_ubuntu": "echo call: sudo apt install libopencv-dev; build-opencv --incDir /usr/include/opencv4/ --libDir /lib/x86_64-linux-gnu/ --binDir=/usr/bin/ --nobuild rebuild",
-    "install_macm1": "node bin/install.js --version 4.5.4 --flag=\"-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64 -DWITH_FFMPEG=ON\" rebuild",
+    "install_macm1": "node bin/install.js --version 4.6.0 --flag=\"-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64 -DWITH_FFMPEG=ON\" rebuild",
     "install_cuda": "cross-env OPENCV4NODEJS_DISABLE_AUTOBUILD= node bin/install.js --version 4.6.0 --flags=\"-DWITH_CUDA=ON -DWITH_CUDNN=ON -DOPENCV_DNN_CUDA=ON -DCUDA_FAST_MATH=ON -DWITH_FFMPEG=ON\" rebuild",
     "install_4_6_0_cuda_30XX": "cross-env OPENCV4NODEJS_DISABLE_AUTOBUILD= node bin/install.js --keepsource --version 4.6.0 --cuda --cudaArch=8.6 rebuild",
     "test": "cd test && pnpm install && pnpm run test",
@@ -55,9 +55,9 @@
     "build-debug": "npm run build && BINDINGS_DEBUG=true node bin/install.js rebuild"
   },
   "dependencies": {
-    "@u4/opencv-build": "0.7.8",
+    "@u4/opencv-build": "^0.8.3",
     "@u4/tiny-glob": "^0.3.2",
-    "nan": "^2.18.0",
+    "nan": "^2.19.0",
     "node-gyp": "^10.0.1",
     "npmlog": "^7.0.1",
     "picocolors": "^1.0.0"

pnpm-lock.yaml

@@ -1,5 +1,17 @@
 {
-  "extends": ["eslint:recommended", "airbnb"],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "project": "./tsconfig.json"
+  },
+  "plugins": [
+    "@typescript-eslint"
+  ],
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"],
   "rules": {
     "linebreak-style": 0,
     "comma-dangle": ["error", "always-multiline"],
@@ -12,13 +24,13 @@
     "no-underscore-dangle": 0,
     "no-nested-ternary": 0,
     "radix": 0,
-
     // unit tests only
     "max-len" : 0,
     "no-new" : 0,
     "no-unused-expressions": 0,
-    "prefer-spread": 0
-
+    "prefer-spread": 0,
+    "@typescript-eslint/ban-ts-comment": 0,
+    "@typescript-eslint/no-explicit-any": 0
   },
   "env": {
     "es6": true,

test/.eslintrc

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import cv from '@u4/opencv4nodejs';
-import { TestContext } from '../tests/model';
+import { getTestContext } from '../tests/model';
 
-const ctxt = new TestContext(cv);
+const ctxt = getTestContext();
 
 describe('External Memory Tracking', () => {
   it('should be enabled (opencv 3.1.0+)/ disabled(opencv 3.0.0) by default', () => {

test/externalMemTracking/defaultDisabled.test.ts

@@ -2,9 +2,12 @@
   "name": "opencv4nodejs_test",
   "version": "1.1.0",
   "scripts": {
-    "test": "mocha -r ts-node/register --timeout 30000 ./tests/index.test.ts",
+    "test": "mocha -r ts-node/register --timeout 30000 ./tests/**/*.test.ts",
     "test2": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register 'tests/**/*.test.ts'",
     "test3": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register 'tests/**/simple.test.ts'",
+    "testIO": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register 'tests/io/**/*.ts'",
+    "testIOIO": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register 'tests/io/io.test.ts'",
+    "testCore": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register 'tests/core/core.test.ts'",
     "test-appveyor": "set APPVEYOR_BUILD=true && mocha -r ts-node/register --timeout 30000 ./tests/index.test.ts",
     "test-docker": "DOCKER_BUILD=true mocha -r ts-node/register --timeout 60000 ./tests/index.test.ts",
     "test-externalMemTrackingOther": "mocha -r ts-node/register --timeout 30000 ./externalMemTracking/other/index.test.ts",

test/package.json

@@ -2,17 +2,18 @@ import { expect } from 'chai';
 import {
   CalibrationMatrixValues, CorrectMatchesRet, DecomposeEssentialMatRet, DecomposeHomographyMatRet, DecomposeProjectionMatrixRet, Mat, OptimalNewCameraMatrix, RqDecomp3x3Ret, StereoRectify, Vec3,
 } from '@u4/opencv4nodejs';
-import { TestContext } from '../model';
+import { getTestContext } from '../model';
 import { assertMetaData } from '../../utils/matTestUtils';
 import { expectToBeVec2, expectToBeVec3, expectToBeVec4 } from '../../utils/testUtils';
 import { generateAPITests } from '../../utils/generateAPITests';
+import toTest from '../toTest';
 
-export default (args: TestContext) => {
+if (toTest.calib3d) {
   const {
     cv,
     cvVersionLowerThan,
     cvVersionGreaterEqual,
-  } = args;
+  } = getTestContext();
 
   const imagePoints = [
     new cv.Point2(0, 0),
@@ -133,7 +134,7 @@ export default (args: TestContext) => {
 
   describe('drawChessboardCorners', () => {
     const expectOutput = () => {
-      // expect not to throw
+    // expect not to throw
     };
 
     const patternSize = new cv.Size(2, 2);
@@ -161,7 +162,7 @@ export default (args: TestContext) => {
   describe('find4QuadCornerSubpix', () => {
     const img = new cv.Mat(200, 200, cv.CV_8U, 0);
     const expectOutput = () => {
-      // expect not to throw
+    // expect not to throw
     };
 
     const regionSize = new cv.Size(2, 2);
@@ -381,7 +382,7 @@ export default (args: TestContext) => {
 
   describe('filterSpeckles', () => {
     const expectOutput = () => {
-      // expect not to throw
+    // expect not to throw
     };
     const newVal = 1.0;
     const maxSpeckleSize = 10;
@@ -402,7 +403,7 @@ export default (args: TestContext) => {
 
   describe('validateDisparity', () => {
     const expectOutput = () => {
-      // expect not to throw
+    // expect not to throw
     };
     const cost = new cv.Mat(10, 10, cv.CV_16S, 0);
     const minDisparity = 1;
@@ -539,4 +540,4 @@ export default (args: TestContext) => {
       });
     });
   }
-};
+}

test/pnpm-lock.yaml

@@ -5,12 +5,13 @@ import {
 import { generateAPITests } from '../../utils/generateAPITests';
 import { assertMetaData } from '../../utils/matTestUtils';
 import { assertPropsWithValue, expectToBeVec3 } from '../../utils/testUtils';
-import { TestContext } from '../model';
+import { getTestContext } from '../model';
+import toTest from '../toTest';
 
-const CV_CALIB_USE_INTRINSIC_GUESS = 1;
+if (toTest.calib3d) {
+  const CV_CALIB_USE_INTRINSIC_GUESS = 1;
 
-export default (args: TestContext) => {
-  const { cv, cvVersionGreaterEqual } = args;
+  const { cv, cvVersionGreaterEqual } = getTestContext();
 
   const objectPoints = [
     new cv.Point3(0, 0, 0),
@@ -256,7 +257,7 @@ export default (args: TestContext) => {
       distCoefficients,
     ];
     // openCV3 only
-    const getOptionalParamsMap = (): Array<[string, any]> => ([
+    const getOptionalParamsMap = (): Array<[string, unknown]> => ([
       ['flags', CV_CALIB_USE_INTRINSIC_GUESS as number],
       ['termCriteria', new cv.TermCriteria()],
     ]);
@@ -538,7 +539,7 @@ export default (args: TestContext) => {
       imagePoints,
       imagePoints,
     ]);
-    const getOptionalParamsMap = (): Array<[string, any]> => ([
+    const getOptionalParamsMap = (): Array<[string, number]> => ([
       ['method', cv.LMEDS],
       ['ransacReprojThreshold', 1.0],
       ['maxIters', 1000],
@@ -599,4 +600,4 @@ export default (args: TestContext) => {
       });
     });
   }
-};
+}