diff --git a/src/BackgroundSubtractor.cc b/src/BackgroundSubtractor.cc index fb33fe2..7ddba75 100644 --- a/src/BackgroundSubtractor.cc +++ b/src/BackgroundSubtractor.cc @@ -56,7 +56,7 @@ NAN_METHOD(BackgroundSubtractorWrap::CreateMOG) { // DOUBLE_FROM_ARGS(noiseSigma, 3) // } - Local n = Nan::New(BackgroundSubtractorWrap::constructor)->GetFunction()->NewInstance(); + Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(BackgroundSubtractorWrap::constructor)).ToLocalChecked()).ToLocalChecked(); cv::Ptr bg; BackgroundSubtractorWrap *pt = new BackgroundSubtractorWrap(bg); @@ -80,7 +80,7 @@ NAN_METHOD(BackgroundSubtractorWrap::ApplyMOG) { try { Local fgMask = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(fgMask); cv::Mat mat; diff --git a/src/Calib3D.cc b/src/Calib3D.cc index 885cbeb..53c84d0 100644 --- a/src/Calib3D.cc +++ b/src/Calib3D.cc @@ -3,7 +3,7 @@ inline Local matrixFromMat(cv::Mat &input) { Local matrixWrap = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *matrix = Nan::ObjectWrap::Unwrap(matrixWrap); matrix->mat = input; @@ -36,10 +36,13 @@ inline std::vector points2fFromArray(Local array) { Local pointsArray = Local::Cast(array->ToObject()); for (unsigned int i = 0; i < pointsArray->Length(); i++) { - Local pt = pointsArray->Get(i)->ToObject(); + Local pt = Nan::Get(pointsArray, i).ToLocalChecked()->ToObject(); points.push_back( - cv::Point2f(pt->Get(Nan::New("x").ToLocalChecked())->ToNumber()->Value(), - pt->Get(Nan::New("y").ToLocalChecked())->ToNumber()->Value())); + cv::Point2f( + Nan::To(Nan::Get(pt, Nan::New("x").ToLocalChecked()).ToLocalChecked()).FromJust(), + Nan::To(Nan::Get(pt, Nan::New("y").ToLocalChecked()).ToLocalChecked()).FromJust() + ) + ); } } else { JSTHROW_TYPE("Points not a valid array"); @@ -56,9 +59,12 @@ inline std::vector points3fFromArray(Local array) { for (unsigned int i = 0; i < pointsArray->Length(); i++) { Local pt = pointsArray->Get(i)->ToObject(); points.push_back( - cv::Point3f(pt->Get(Nan::New("x").ToLocalChecked())->ToNumber()->Value(), - pt->Get(Nan::New("y").ToLocalChecked())->ToNumber()->Value(), - pt->Get(Nan::New("z").ToLocalChecked())->ToNumber()->Value())); + cv::Point3f( + Nan::To(Nan::Get(pt, Nan::New("x").ToLocalChecked()).ToLocalChecked()).FromJust(), + Nan::To(Nan::Get(pt, Nan::New("y").ToLocalChecked()).ToLocalChecked()).FromJust(), + Nan::To(Nan::Get(pt, Nan::New("z").ToLocalChecked()).ToLocalChecked()).FromJust() + ) + ); } } else { JSTHROW_TYPE("Must pass array of object points for each frame") @@ -313,7 +319,7 @@ NAN_METHOD(Calib3D::GetOptimalNewCameraMatrix) { cv::Size imageSize = sizeFromArray(info[2]); // Arg 3 is the alpha free scaling parameter - double alpha = info[3]->ToNumber()->Value(); + double alpha = Nan::To(info[3]).FromJust(); // Arg 4, the new image size cv::Size newImageSize = sizeFromArray(info[4]); @@ -497,7 +503,7 @@ NAN_METHOD(Calib3D::ComputeCorrespondEpilines) { std::vector points = points2fFromArray(info[0]); // Arg1, the image index (1 or 2) - int whichImage = int(info[1]->ToNumber()->Value()); + int whichImage = Nan::To(info[1]).FromJust(); // Arg2, the fundamental matrix cv::Mat F = matFromMatrix(info[2]); diff --git a/src/FaceRecognizer.cc b/src/FaceRecognizer.cc index eb41e1a..50b67c4 100644 --- a/src/FaceRecognizer.cc +++ b/src/FaceRecognizer.cc @@ -90,7 +90,7 @@ NAN_METHOD(FaceRecognizerWrap::CreateLBPH) { INT_FROM_ARGS(grid_y, 3) DOUBLE_FROM_ARGS(threshold, 4) - Local n = Nan::New(FaceRecognizerWrap::constructor)->GetFunction()->NewInstance(); + Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(FaceRecognizerWrap::constructor)).ToLocalChecked()).ToLocalChecked(); cv::Ptr f = cv::createLBPHFaceRecognizer(radius, neighbors, grid_x, grid_y, threshold); FaceRecognizerWrap *pt = new FaceRecognizerWrap(f, LBPH); @@ -108,7 +108,7 @@ NAN_METHOD(FaceRecognizerWrap::CreateEigen) { INT_FROM_ARGS(components, 0) DOUBLE_FROM_ARGS(threshold, 1) - Local n = Nan::New(FaceRecognizerWrap::constructor)->GetFunction()->NewInstance(); + Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(FaceRecognizerWrap::constructor)).ToLocalChecked()).ToLocalChecked(); cv::Ptr f = cv::createEigenFaceRecognizer(components, threshold); FaceRecognizerWrap *pt = new FaceRecognizerWrap(f, EIGEN); @@ -126,7 +126,7 @@ NAN_METHOD(FaceRecognizerWrap::CreateFisher) { INT_FROM_ARGS(components, 0) DOUBLE_FROM_ARGS(threshold, 1) - Local n = Nan::New(FaceRecognizerWrap::constructor)->GetFunction()->NewInstance(); + Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(FaceRecognizerWrap::constructor)).ToLocalChecked()).ToLocalChecked(); cv::Ptr f = cv::createFisherFaceRecognizer(components, threshold); @@ -420,7 +420,7 @@ NAN_METHOD(FaceRecognizerWrap::GetMat) { m = self->rec->getMat(key); #endif - Local im = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im); img->mat = m; diff --git a/src/ImgProc.cc b/src/ImgProc.cc index cc56658..f181683 100644 --- a/src/ImgProc.cc +++ b/src/ImgProc.cc @@ -34,7 +34,7 @@ NAN_METHOD(ImgProc::DistanceTransform) { cv::distanceTransform(inputImage, outputImage, distType, 0); // Wrap the output image - Local outMatrixWrap = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local outMatrixWrap = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *outMatrix = Nan::ObjectWrap::Unwrap(outMatrixWrap); outMatrix->mat = outputImage; @@ -73,7 +73,7 @@ NAN_METHOD(ImgProc::Undistort) { cv::undistort(inputImage, outputImage, K, dist); // Wrap the output image - Local outMatrixWrap = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local outMatrixWrap = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *outMatrix = Nan::ObjectWrap::Unwrap(outMatrixWrap); outMatrix->mat = outputImage; @@ -126,11 +126,11 @@ NAN_METHOD(ImgProc::InitUndistortRectifyMap) { cv::initUndistortRectifyMap(K, dist, R, newK, imageSize, m1type, map1, map2); // Wrap the output maps - Local map1Wrap = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local map1Wrap = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *map1Matrix = Nan::ObjectWrap::Unwrap(map1Wrap); map1Matrix->mat = map1; - Local map2Wrap = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local map2Wrap = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *map2Matrix = Nan::ObjectWrap::Unwrap(map2Wrap); map2Matrix->mat = map2; @@ -179,7 +179,7 @@ NAN_METHOD(ImgProc::Remap) { cv::remap(inputImage, outputImage, map1, map2, interpolation); // Wrap the output image - Local outMatrixWrap = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local outMatrixWrap = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *outMatrix = Nan::ObjectWrap::Unwrap(outMatrixWrap); outMatrix->mat = outputImage; @@ -221,7 +221,7 @@ NAN_METHOD(ImgProc::GetStructuringElement) { cv::Mat mat = cv::getStructuringElement(shape, ksize); // Wrap the output image - Local outMatrixWrap = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local outMatrixWrap = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *outMatrix = ObjectWrap::Unwrap(outMatrixWrap); outMatrix->mat = mat; diff --git a/src/LDAWrap.cc b/src/LDAWrap.cc index b787dbf..10ceb00 100644 --- a/src/LDAWrap.cc +++ b/src/LDAWrap.cc @@ -61,7 +61,7 @@ NAN_METHOD(LDAWrap::SubspaceProject) { cv::Mat m = cv::subspaceProject(w->mat, mean->mat, src->mat); - Local im = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im); img->mat = m; @@ -87,7 +87,7 @@ NAN_METHOD(LDAWrap::SubspaceReconstruct) { cv::Mat m = cv::subspaceReconstruct(w->mat, mean->mat, src->mat); - Local im = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im); img->mat = m; diff --git a/src/Matrix.cc b/src/Matrix.cc index cda5221..25c1642 100755 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -342,7 +342,7 @@ NAN_METHOD(Matrix::GetData) { v8::Local globalObj = Nan::GetCurrentContext()->Global(); v8::Local bufferConstructor = v8::Local::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked())); v8::Local constructorArgs[3] = {buf, Nan::New((unsigned) size), Nan::New(0)}; - v8::Local actualBuffer = bufferConstructor->NewInstance(3, constructorArgs); + v8::Local actualBuffer = Nan::NewInstance(bufferConstructor, 3, constructorArgs).ToLocalChecked(); info.GetReturnValue().Set(actualBuffer); } @@ -513,7 +513,7 @@ NAN_METHOD(Matrix::Clone) { SETUP_FUNCTION(Matrix) Local < Object > im_h = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m = Nan::ObjectWrap::Unwrap(im_h); m->mat = self->mat.clone(); @@ -535,7 +535,7 @@ NAN_METHOD(Matrix::Crop) { cv::Rect roi(x, y, width, height); Local < Object > im_h = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m = Nan::ObjectWrap::Unwrap(im_h); m->mat = self->mat(roi); @@ -685,8 +685,7 @@ NAN_METHOD(Matrix::ToBuffer) { > ::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked())); v8::Local constructorArgs[3] = {buf, Nan::New((unsigned)vec.size()), Nan::New(0)}; - v8::Local < v8::Object > actualBuffer = bufferConstructor->NewInstance(3, - constructorArgs); + v8::Local < v8::Object > actualBuffer = Nan::NewInstance(bufferConstructor, 3, constructorArgs).ToLocalChecked(); info.GetReturnValue().Set(actualBuffer); } @@ -721,7 +720,7 @@ public: v8::Local globalObj = Nan::GetCurrentContext()->Global(); v8::Local bufferConstructor = v8::Local::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked())); v8::Local constructorArgs[3] = {buf, Nan::New((unsigned)res.size()), Nan::New(0)}; - v8::Local actualBuffer = bufferConstructor->NewInstance(3, constructorArgs); + v8::Local actualBuffer = Nan::NewInstance(bufferConstructor, 3, constructorArgs).ToLocalChecked();; Local argv[] = { Nan::Null(), @@ -1035,7 +1034,7 @@ NAN_METHOD(Matrix::Zeros) { int h = info[1]->Uint32Value(); int type = (info.Length() > 2) ? info[2]->IntegerValue() : CV_64FC1; - Local im_h = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_h = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_h); cv::Mat mat = cv::Mat::zeros(w, h, type); @@ -1050,7 +1049,7 @@ NAN_METHOD(Matrix::Ones) { int h = info[1]->Uint32Value(); int type = (info.Length() > 2) ? info[2]->IntegerValue() : CV_64FC1; - Local im_h = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_h = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_h); cv::Mat mat = cv::Mat::ones(w, h, type); @@ -1065,7 +1064,7 @@ NAN_METHOD(Matrix::Eye) { int h = info[1]->Uint32Value(); int type = (info.Length() > 2) ? info[2]->IntegerValue() : CV_64FC1; - Local im_h = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_h = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_h); cv::Mat mat = cv::Mat::eye(w, h, type); @@ -1126,7 +1125,7 @@ NAN_METHOD(Matrix::GaussianBlur) { } ksize = cv::Size(x->NumberValue(), y->NumberValue()); if (info[1]->IsNumber()) { - sigma = info[1]->ToNumber()->Value(); + sigma = Nan::To(info[1]).FromJust(); } } @@ -1208,7 +1207,7 @@ NAN_METHOD(Matrix::Sobel) { Matrix *self = Nan::ObjectWrap::Unwrap(info.This()); Local result_to_return = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *result = Nan::ObjectWrap::Unwrap(result_to_return); cv::Sobel(self->mat, result->mat, ddepth, xorder, yorder, ksize, scale, delta, borderType); @@ -1222,7 +1221,7 @@ NAN_METHOD(Matrix::Copy) { Matrix *self = Nan::ObjectWrap::Unwrap(info.This()); Local img_to_return = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); self->mat.copyTo(img->mat); @@ -1239,9 +1238,9 @@ NAN_METHOD(Matrix::Flip) { "(0 = X axis, positive = Y axis, negative = both axis)"); } - int flipCode = info[0]->ToInt32()->Value(); + int flipCode = Nan::To(info[0]).FromJust(); - Local img_to_return = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local img_to_return = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); cv::flip(self->mat, img->mat, flipCode); @@ -1258,7 +1257,7 @@ NAN_METHOD(Matrix::ROI) { } // Although it's an image to return, it is in fact a pointer to ROI of parent matrix - Local img_to_return = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local img_to_return = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); int x = info[0]->IntegerValue(); @@ -1304,7 +1303,7 @@ NAN_METHOD(Matrix::Dct) { int cols = self->mat.cols; int rows = self->mat.rows; - Local out = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local out = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_out = Nan::ObjectWrap::Unwrap(out); m_out->mat.create(cols, rows, CV_32F); @@ -1320,7 +1319,7 @@ NAN_METHOD(Matrix::Idct) { int cols = self->mat.cols; int rows = self->mat.rows; - Local out = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local out = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_out = Nan::ObjectWrap::Unwrap(out); m_out->mat.create(cols, rows, CV_32F); @@ -1359,7 +1358,7 @@ NAN_METHOD(Matrix::Add) { Matrix *src1 = Nan::ObjectWrap::Unwrap(info[0]->ToObject()); - Local out = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local out = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_out = Nan::ObjectWrap::Unwrap(out); m_out->mat.create(cols, rows, self->mat.type()); @@ -1538,7 +1537,7 @@ NAN_METHOD(Matrix::FindContours) { } Matrix *self = Nan::ObjectWrap::Unwrap(info.This()); - Local conts_to_return= Nan::New(Contour::constructor)->GetFunction()->NewInstance(); + Local conts_to_return = Nan::NewInstance(Nan::GetFunction(Nan::New(Contour::constructor)).ToLocalChecked()).ToLocalChecked(); Contour *contours = Nan::ObjectWrap::Unwrap(conts_to_return); cv::findContours(self->mat, contours->contours, contours->hierarchy, mode, chain); @@ -1567,7 +1566,10 @@ NAN_METHOD(Matrix::DrawContour) { cv::Point offset; if (info.Length() == 6) { Local _offset = Local::Cast(info[5]); - offset = cv::Point(_offset->Get(0)->ToNumber()->Value(), _offset->Get(1)->ToNumber()->Value()); + offset = cv::Point( + Nan::To(Nan::Get(_offset, 0).ToLocalChecked()).FromJust(), + Nan::To(Nan::Get(_offset, 1).ToLocalChecked()).FromJust() + ); } cv::drawContours(self->mat, cont->contours, pos, color, thickness, lineType, cont->hierarchy, maxLevel, offset); @@ -1838,7 +1840,7 @@ NAN_METHOD(Matrix::Rotate) { cv::Mat rotMatrix(2, 3, CV_32FC1); cv::Mat res; - float angle = info[0]->ToNumber()->Value(); + float angle = Nan::To(info[0]).FromJust(); // Modification by SergeMv //------------- @@ -1888,13 +1890,13 @@ NAN_METHOD(Matrix::GetRotationMatrix2D) { JSTHROW("Invalid number of arguments"); } - float angle = info[0]->ToNumber()->Value(); - int x = info[1]->Uint32Value(); - int y = info[2]->Uint32Value(); - double scale = info[3]->IsUndefined() ? 1.0 : info[3]->NumberValue(); + float angle = Nan::To(info[0]).FromJust(); + int x = Nan::To(info[1]).FromJust(); + int y = Nan::To(info[2]).FromJust(); + double scale = Nan::To(info[3]).FromMaybe(1.0); Local img_to_return = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); cv::Point center = cv::Point(x,y); @@ -2058,7 +2060,7 @@ NAN_METHOD(Matrix::Threshold) { } Local < Object > img_to_return = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); self->mat.copyTo(img->mat); @@ -2077,7 +2079,7 @@ NAN_METHOD(Matrix::AdaptiveThreshold) { double C = info[4]->NumberValue(); Local < Object > img_to_return = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); self->mat.copyTo(img->mat); @@ -2092,9 +2094,9 @@ NAN_METHOD(Matrix::MeanStdDev) { Matrix *self = Nan::ObjectWrap::Unwrap(info.This()); - Local mean = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local mean = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_mean = Nan::ObjectWrap::Unwrap(mean); - Local stddev = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local stddev = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_stddev = Nan::ObjectWrap::Unwrap(stddev); cv::meanStdDev(self->mat, m_mean->mat, m_stddev->mat); @@ -2255,7 +2257,7 @@ NAN_METHOD(Matrix::Split) { v8::Local arrChannels = Nan::New(size); for (unsigned int i = 0; i < size; i++) { Local matObject = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix * m = Nan::ObjectWrap::Unwrap(matObject); m->mat = channels[i]; arrChannels->Set(i, matObject); @@ -2435,7 +2437,7 @@ NAN_METHOD(Matrix::MatchTemplateByMatrix) { Matrix *self = Nan::ObjectWrap::Unwrap(info.This()); Matrix *templ = Nan::ObjectWrap::Unwrap(info[0]->ToObject()); - Local out = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local out = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_out = Nan::ObjectWrap::Unwrap(out); int cols = self->mat.cols - templ->mat.cols + 1; int rows = self->mat.rows - templ->mat.rows + 1; @@ -2469,7 +2471,7 @@ NAN_METHOD(Matrix::MatchTemplate) { cv::Mat templ; templ = cv::imread(filename, -1); - Local out = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local out = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *m_out = Nan::ObjectWrap::Unwrap(out); int cols = self->mat.cols - templ.cols + 1; int rows = self->mat.rows - templ.rows + 1; @@ -2627,7 +2629,7 @@ NAN_METHOD(Matrix::GetPerspectiveTransform) { tgt_corners[i] = cvPoint(tgtArray->Get(i*2)->IntegerValue(),tgtArray->Get(i*2+1)->IntegerValue()); } - Local xfrm = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local xfrm = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *xfrmmat = Nan::ObjectWrap::Unwrap(xfrm); xfrmmat->mat = cv::getPerspectiveTransform(src_corners, tgt_corners); @@ -2785,7 +2787,7 @@ NAN_METHOD(Matrix::Reshape) { } Local img_to_return = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(img_to_return); img->mat = self->mat.reshape(cn, rows); diff --git a/src/OpenCV.cc b/src/OpenCV.cc index c0e666b..d77090e 100755 --- a/src/OpenCV.cc +++ b/src/OpenCV.cc @@ -22,7 +22,7 @@ NAN_METHOD(OpenCV::ReadImage) { Local argv[2]; argv[0] = Nan::Null(); - Local im_h = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_h = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_h); argv[1] = im_h; @@ -96,7 +96,7 @@ NAN_METHOD(OpenCV::ReadImageMulti) { argv[1] = output; for (std::vector::size_type i = 0; i < mats.size(); i ++) { - Local im_h = Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_h = Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_h); img->mat = mats[i]; diff --git a/src/Stereo.cc b/src/Stereo.cc index 7831b66..80335c6 100644 --- a/src/Stereo.cc +++ b/src/Stereo.cc @@ -89,7 +89,7 @@ NAN_METHOD(StereoBM::Compute) { // Wrap the returned disparity map Local < Object > disparityWrap = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *disp = Nan::ObjectWrap::Unwrap(disparityWrap); disp->mat = disparity; @@ -224,7 +224,7 @@ NAN_METHOD(StereoSGBM::Compute) { // Wrap the returned disparity map Local < Object > disparityWrap = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *disp = Nan::ObjectWrap::Unwrap(disparityWrap); disp->mat = disparity; @@ -308,7 +308,7 @@ NAN_METHOD(StereoGC::Compute) { // Wrap the returned disparity map Local < Object > disparityWrap = - Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *disp = Nan::ObjectWrap::Unwrap(disparityWrap); disp->mat = disparity; diff --git a/src/VideoCaptureWrap.cc b/src/VideoCaptureWrap.cc index 5afbf65..47eb8d5 100755 --- a/src/VideoCaptureWrap.cc +++ b/src/VideoCaptureWrap.cc @@ -187,7 +187,7 @@ public: void HandleOKCallback() { Nan::HandleScope scope; - Local im_to_return= Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_to_return= Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_to_return); img->mat = mat; @@ -226,7 +226,7 @@ NAN_METHOD(VideoCaptureWrap::ReadSync) { Nan::HandleScope scope; VideoCaptureWrap *v = Nan::ObjectWrap::Unwrap(info.This()); - Local im_to_return= Nan::New(Matrix::constructor)->GetFunction()->NewInstance(); + Local im_to_return= Nan::NewInstance(Nan::GetFunction(Nan::New(Matrix::constructor)).ToLocalChecked()).ToLocalChecked(); Matrix *img = Nan::ObjectWrap::Unwrap(im_to_return); v->cap.read(img->mat);