Merge pull request #692 from Garfonso/master

add waitKeyEx method

Author: justadudewhohacks

cc/io/io.cc

@@ -16,6 +16,9 @@ NAN_MODULE_INIT(Io::Init) {
   Nan::SetMethod(target, "imshowWait", ImshowWait);
   Nan::SetMethod(target, "imwrite", Imwrite);
   Nan::SetMethod(target, "waitKey", WaitKey);
+#if CV_VERSION_GREATER_EQUAL(3, 2, 0)
+  Nan::SetMethod(target, "waitKeyEx", WaitKeyEx);
+#endif
   Nan::SetMethod(target, "imencode", Imencode);
   Nan::SetMethod(target, "imdecode", Imdecode);
   Nan::SetMethod(target, "moveWindow", MoveWindow);
@@ -105,6 +108,18 @@ NAN_METHOD(Io::WaitKey) {
   info.GetReturnValue().Set(Nan::New(key));
 }
 
+#if CV_VERSION_GREATER_EQUAL(3, 2, 0)
+NAN_METHOD(Io::WaitKeyEx) {
+  int key;
+  if (info[0]->IsNumber()) {
+    key = cv::waitKeyEx(info[0]->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value());
+  } else{
+    key = cv::waitKeyEx();
+  }
+  info.GetReturnValue().Set(Nan::New(key));
+}
+#endif
+
 NAN_METHOD(Io::MoveWindow) {
 	FF::TryCatch tryCatch("Io::MoveWindow");
 	std::string winName;

cc/io/io.h

@@ -16,6 +16,9 @@ class Io {
 	static NAN_METHOD(Imshow);
 	static NAN_METHOD(ImshowWait);
 	static NAN_METHOD(WaitKey);
+#if CV_VERSION_GREATER_EQUAL(3, 2, 0)
+	static NAN_METHOD(WaitKeyEx);
+#endif
 	static NAN_METHOD(MoveWindow);
 	static NAN_METHOD(DestroyWindow);
 	static NAN_METHOD(DestroyAllWindows);
@@ -29,4 +32,4 @@ class Io {
 	static NAN_METHOD(ImdecodeAsync);
 };
 
-#endif
+#endif

lib/typings/cv.d.ts

@@ -208,6 +208,7 @@ export function transformAsync(mat: Mat, m: Mat): Promise<Mat>;
 export function undistortPoints(srcPoints: Point2[], cameraMatrix: Mat, distCoeffs: Mat): Point2[];
 export function undistortPointsAsync(srcPoints: Point2[], cameraMatrix: Mat, distCoeffs: Mat): Promise<Point2[]>;
 export function waitKey(delay?: number): number;
+export function waitKeyEx(delay?: number): number;
 
 export type DrawParams = {
   thickness?: number;