Merge pull request #78 from RomanVeretenov/master

Update highguiConstants.cc
UrielCh · Feb 28, 2023 · bd7b3ac · bd7b3ac
2 parents 6869a0a + 87979eb
commit bd7b3ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cc/highgui/highguiConstants.cc b/cc/highgui/highguiConstants.cc
@@ -26,7 +26,7 @@ void HighguiConstants::Init(v8::Local<v8::Object> target)
 	FF_SET_CV_CONSTANT(target, WND_PROP_ASPECT_RATIO);
 	FF_SET_CV_CONSTANT(target, WND_PROP_OPENGL);
 	FF_SET_CV_CONSTANT(target, WND_PROP_VISIBLE);
-	#if CV_VERSION_GREATER_EQUAL(3, 4, 8)
+	#if CV_VERSION_GREATER_EQUAL(4, 1, 2)
 	FF_SET_CV_CONSTANT(target, WND_PROP_TOPMOST);
     #endif
 	#if CV_VERSION_GREATER_EQUAL(4, 5, 2)

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   "scripts": {
     "build": "tsc --pretty --project .",
     "prepack": "npm run build",
-    "install": "node bin/install.js auto",
+    "install": "npm run build && node bin/install.js auto",
     "install_Mac": "npm run build && CXXFLAGS=\"-std=c++14 -Wno-c++11-narrowing\" node ./install/install.js --version 4.5.3 build",
     "install_default": "npm run build && 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",
@@ -87,6 +87,7 @@
     "lib",
     "bin",
     "typings",
-    "binding.gyp"
+    "binding.gyp",
+    "tsconfig.json"
   ]
-}
+}