Merge pull request #686 from grandpaul/paulliu-fix-ftbfs

src: FaceRecognizer.cc: fix FTBFS on nodejs 14
This commit is contained in:
Peter Braden 2023-01-20 17:28:34 +01:00 committed by GitHub
commit c81fbf955e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -199,12 +199,12 @@ Local<Value> UnwrapTrainingData(Nan::NAN_METHOD_ARGS_TYPE info,
Local<Array> valarr = Local<Array>::Cast(val); Local<Array> valarr = Local<Array>::Cast(val);
if (valarr->Length() != 2 || !valarr->Get(Nan::GetCurrentContext(),0)->IsInt32()) { if (valarr->Length() != 2 || !valarr->Get(Nan::GetCurrentContext(),0).ToLocalChecked()->IsInt32()) {
JSTHROW("train takes a list of [label, image] tuples") JSTHROW("train takes a list of [label, image] tuples")
} }
int label = valarr->Get(Nan::GetCurrentContext(),0)->Uint32Value(Nan::GetCurrentContext()).ToChecked(); int label = valarr->Get(Nan::GetCurrentContext(),0).ToLocalChecked()->Uint32Value(Nan::GetCurrentContext()).ToChecked();
cv::Mat im = fromMatrixOrFilename(valarr->Get(Nan::GetCurrentContext(),1)); //this is ok because we clone the image cv::Mat im = fromMatrixOrFilename(valarr->Get(Nan::GetCurrentContext(),1).ToLocalChecked()); //this is ok because we clone the image
im = im.clone(); im = im.clone();
if (im.channels() == 3) { if (im.channels() == 3) {
cv::cvtColor(im, im, CV_RGB2GRAY); cv::cvtColor(im, im, CV_RGB2GRAY);