From b7967c3293070842e1053ae2b1b854f81e49d1d0 Mon Sep 17 00:00:00 2001 From: Dan Schultzer Date: Sat, 16 Sep 2017 12:39:32 -0700 Subject: [PATCH] Fix new face recognizer setup --- src/FaceRecognizer.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/FaceRecognizer.cc b/src/FaceRecognizer.cc index 50b67c4..3393aed 100644 --- a/src/FaceRecognizer.cc +++ b/src/FaceRecognizer.cc @@ -8,9 +8,9 @@ #if CV_MAJOR_VERSION >= 3 namespace cv { using std::vector; - using cv::face::createEigenFaceRecognizer; - using cv::face::createFisherFaceRecognizer; - using cv::face::createLBPHFaceRecognizer; + using cv::face::EigenFaceRecognizer; + using cv::face::FisherFaceRecognizer; + using cv::face::LBPHFaceRecognizer; } #endif @@ -68,7 +68,7 @@ NAN_METHOD(FaceRecognizerWrap::New) { } // By default initialize LBPH - cv::Ptr f = cv::createLBPHFaceRecognizer(1, 8, 8, 8, 80.0); + cv::Ptr f = cv::LBPHFaceRecognizer::create(1, 8, 8, 8, 80.0); FaceRecognizerWrap *pt = new FaceRecognizerWrap(f, LBPH); pt->Wrap(info.This()); @@ -91,7 +91,7 @@ NAN_METHOD(FaceRecognizerWrap::CreateLBPH) { DOUBLE_FROM_ARGS(threshold, 4) Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(FaceRecognizerWrap::constructor)).ToLocalChecked()).ToLocalChecked(); - cv::Ptr f = cv::createLBPHFaceRecognizer(radius, + cv::Ptr f = cv::LBPHFaceRecognizer::create(radius, neighbors, grid_x, grid_y, threshold); FaceRecognizerWrap *pt = new FaceRecognizerWrap(f, LBPH); pt->Wrap(n); @@ -109,7 +109,7 @@ NAN_METHOD(FaceRecognizerWrap::CreateEigen) { DOUBLE_FROM_ARGS(threshold, 1) Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(FaceRecognizerWrap::constructor)).ToLocalChecked()).ToLocalChecked(); - cv::Ptr f = cv::createEigenFaceRecognizer(components, + cv::Ptr f = cv::EigenFaceRecognizer::create(components, threshold); FaceRecognizerWrap *pt = new FaceRecognizerWrap(f, EIGEN); pt->Wrap(n); @@ -128,7 +128,7 @@ NAN_METHOD(FaceRecognizerWrap::CreateFisher) { Local n = Nan::NewInstance(Nan::GetFunction(Nan::New(FaceRecognizerWrap::constructor)).ToLocalChecked()).ToLocalChecked(); - cv::Ptr f = cv::createFisherFaceRecognizer(components, + cv::Ptr f = cv::FisherFaceRecognizer::create(components, threshold); FaceRecognizerWrap *pt = new FaceRecognizerWrap(f, FISHER); pt->Wrap(n); @@ -378,7 +378,7 @@ NAN_METHOD(FaceRecognizerWrap::SaveSync) { JSTHROW("Save takes a filename") } std::string filename = std::string(*Nan::Utf8String(info[0]->ToString())); - self->rec->save(filename); + self->rec->write(filename); return; } @@ -388,7 +388,7 @@ NAN_METHOD(FaceRecognizerWrap::LoadSync) { JSTHROW("Load takes a filename") } std::string filename = std::string(*Nan::Utf8String(info[0]->ToString())); - self->rec->load(filename); + self->rec->read(filename); return; }