Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit 6f740fa

Browse files
justadudewhohacksjustadudewhohacks
committed
fixed ToObject deprecated warnings + fixed uncaught cpp exception when creating SURF/SIFT when not compiled with OPENCV_ENABLE_NONFREE
1 parent 50abad2 commit 6f740fa

39 files changed

+207
-182
lines changed

‎cc/core/Mat.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ NAN_METHOD(Mat::New) {
195195
/* raw data, row, col, type */
196196
else if (info.Length() == 4 && info[1]->IsNumber() && info[2]->IsNumber() && info[3]->IsInt32()) {
197197
int type = info[3]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value();
198-
char *data = static_cast<char *>(node::Buffer::Data(info[0]->ToObject()));
198+
char *data = static_cast<char *>(node::Buffer::Data(info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked()));
199199
cv::Mat mat(info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), info[2]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), type);
200200
size_t size = mat.rows * mat.cols * mat.elemSize();
201201
memcpy(mat.data, data, size);
@@ -296,15 +296,15 @@ NAN_METHOD(Mat::Set) {
296296
}
297297
else if (FF_IS_INSTANCE(Vec2::constructor, info[2])) {
298298
FF_ASSERT_CHANNELS(cn, 2, "Mat::Set");
299-
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<2>(FF_UNWRAP_VEC2_AND_GET(info[2]->ToObject())), matSelf.type(), FF_MAT_SET, FF::matPut);
299+
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<2>(FF_UNWRAP_VEC2_AND_GET(info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked())), matSelf.type(), FF_MAT_SET, FF::matPut);
300300
}
301301
else if (FF_IS_INSTANCE(Vec3::constructor, info[2])) {
302302
FF_ASSERT_CHANNELS(cn, 3, "Mat::Set");
303-
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<3>(FF_UNWRAP_VEC3_AND_GET(info[2]->ToObject())), matSelf.type(), FF_MAT_SET, FF::matPut);
303+
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<3>(FF_UNWRAP_VEC3_AND_GET(info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked())), matSelf.type(), FF_MAT_SET, FF::matPut);
304304
}
305305
else if (FF_IS_INSTANCE(Vec4::constructor, info[2])) {
306306
FF_ASSERT_CHANNELS(cn, 4, "Mat::Set");
307-
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<4>(FF_UNWRAP_VEC4_AND_GET(info[2]->ToObject())), matSelf.type(), FF_MAT_SET, FF::matPut);
307+
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<4>(FF_UNWRAP_VEC4_AND_GET(info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked())), matSelf.type(), FF_MAT_SET, FF::matPut);
308308
}
309309
else if (info[2]->IsNumber()) {
310310
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, info[2], matSelf.type(), FF_MAT_SET, FF::matPut);
@@ -345,7 +345,7 @@ NAN_METHOD(Mat::GetRegion) {
345345
if (!FF_IS_INSTANCE(Rect::constructor, info[0])) {
346346
return Nan::ThrowError("Mat::GetRegion expected arg0 to be an instance of Rect");
347347
}
348-
cv::Rect2d rect = FF_UNWRAP(info[0]->ToObject(), Rect)->rect;
348+
cv::Rect2d rect = FF_UNWRAP(info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked(), Rect)->rect;
349349
FF_OBJ jsRegion = FF_NEW_INSTANCE(constructor);
350350
FF_UNWRAP_MAT_AND_GET(jsRegion) = FF_UNWRAP_MAT_AND_GET(info.This())(rect);
351351
FF_RETURN(jsRegion);
@@ -360,7 +360,7 @@ NAN_METHOD(Mat::Norm) {
360360

361361
// optional args
362362
bool hasOptArgsObj = FF_HAS_ARG((long)i) && info[i]->IsObject();
363-
FF_OBJ optArgs = hasOptArgsObj ? info[i]->ToObject() : FF_NEW_OBJ();
363+
FF_OBJ optArgs = hasOptArgsObj ? info[i]->ToObject(Nan::GetCurrentContext()).ToLocalChecked() : FF_NEW_OBJ();
364364
FF_GET_UINT_IFDEF(optArgs, uint normType, "normType", cv::NORM_L2);
365365
FF_GET_INSTANCE_IFDEF(optArgs, cv::Mat mask, "mask", Mat::constructor, FF_UNWRAP_MAT_AND_GET, Mat, cv::noArray().getMat());
366366
if (!hasOptArgsObj) {
@@ -383,7 +383,7 @@ NAN_METHOD(Mat::Normalize) {
383383

384384
// optional args
385385
bool hasOptArgsObj = FF_HAS_ARG(0) && info[0]->IsObject();
386-
FF_OBJ optArgs = hasOptArgsObj ? info[0]->ToObject() : FF_NEW_OBJ();
386+
FF_OBJ optArgs = hasOptArgsObj ? info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked() : FF_NEW_OBJ();
387387
FF_GET_NUMBER_IFDEF(optArgs, double alpha, "alpha", 1.0);
388388
FF_GET_NUMBER_IFDEF(optArgs, double beta, "beta", 0.0);
389389
FF_GET_UINT_IFDEF(optArgs, uint normType, "normType", cv::NORM_L2);

‎cc/core/MatBindings.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ namespace MatBindings {
229229
}
230230

231231
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
232-
v8::Local<v8::Object> opts = info[1]->ToObject();
232+
v8::Local<v8::Object> opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
233233
return (
234234
DoubleConverter::optProp(&alpha, "alpha", opts) ||
235235
DoubleConverter::optProp(&beta, "beta", opts)
@@ -470,7 +470,7 @@ namespace MatBindings {
470470
}
471471

472472
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
473-
FF_OBJ opts = info[0]->ToObject();
473+
FF_OBJ opts = info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
474474
return (
475475
IntConverter::optProp(&flags, "flags", opts) ||
476476
IntConverter::optProp(&nonzeroRows, "nonzeroRows", opts)
@@ -519,7 +519,7 @@ namespace MatBindings {
519519
}
520520

521521
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
522-
FF_OBJ opts = info[1]->ToObject();
522+
FF_OBJ opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
523523
return (
524524
BoolConverter::optProp(&dftRows, "dftRows", opts) ||
525525
BoolConverter::optProp(&conjB, "conjB", opts)
@@ -666,7 +666,7 @@ namespace MatBindings {
666666
}
667667

668668
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
669-
v8::Local<v8::Object> opts = info[0]->ToObject();
669+
v8::Local<v8::Object> opts = info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
670670
return (
671671
DoubleConverter::optProp(&alpha, "alpha", opts) ||
672672
DoubleConverter::optProp(&beta, "beta", opts)
@@ -731,7 +731,7 @@ namespace MatBindings {
731731
}
732732

733733
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
734-
v8::Local<v8::Object> opts = info[3]->ToObject();
734+
v8::Local<v8::Object> opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
735735
return (
736736
Mat::Converter::optProp(&mask, "mask", opts) ||
737737
IntConverter::optProp(&blockSize, "blockSize", opts) ||
@@ -879,7 +879,7 @@ namespace MatBindings {
879879
}
880880

881881
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
882-
v8::Local<v8::Object> opts = info[4]->ToObject();
882+
v8::Local<v8::Object> opts = info[4]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
883883
return (
884884
IntConverter::optProp(&borderType, "borderType", opts) ||
885885
(

‎cc/core/MatCalib3dBindings.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ namespace MatCalib3dBindings {
322322
}
323323

324324
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
325-
v8::Local<v8::Object> opts = info[6]->ToObject();
325+
v8::Local<v8::Object> opts = info[6]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
326326
return (
327327
IntConverter::optProp(&flags, "flags", opts) ||
328328
DoubleConverter::optProp(&alpha, "alpha", opts) ||
@@ -455,7 +455,7 @@ namespace MatCalib3dBindings {
455455
}
456456

457457
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
458-
v8::Local<v8::Object> opts = info[3]->ToObject();
458+
v8::Local<v8::Object> opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
459459
return (
460460
Size::Converter::optProp(&newImgSize, "newImgSize", opts) ||
461461
BoolConverter::optProp(&centerPrincipalPoint, "centerPrincipalPoint", opts)
@@ -660,7 +660,7 @@ namespace MatCalib3dBindings {
660660
}
661661

662662
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
663-
v8::Local<v8::Object> opts = info[1]->ToObject();
663+
v8::Local<v8::Object> opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
664664
return (
665665
BoolConverter::optProp(&handleMissingValues, "handleMissingValues", opts) ||
666666
IntConverter::optProp(&ddepth, "ddepth", opts)
@@ -752,7 +752,7 @@ namespace MatCalib3dBindings {
752752
}
753753

754754
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
755-
v8::Local<v8::Object> opts = info[2]->ToObject();
755+
v8::Local<v8::Object> opts = info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
756756
return (
757757
IntConverter::optProp(&method, "method", opts) ||
758758
DoubleConverter::optProp(&prob, "prob", opts) ||

‎cc/core/MatImgproc.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ NAN_METHOD(MatImgproc::DrawContours) {
118118

119119
// optional args
120120
bool hasOptArgsObj = FF_HAS_ARG(2) && info[2]->IsObject();
121-
FF_OBJ optArgs = hasOptArgsObj ? info[2]->ToObject() : FF_NEW_OBJ();
121+
FF_OBJ optArgs = hasOptArgsObj ? info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked() : FF_NEW_OBJ();
122122
FF_GET_INT_IFDEF(optArgs, int contourIdx, "contourIdx", 0);
123123
FF_GET_INT_IFDEF(optArgs, int maxLevel, "maxLevel", INT_MAX);
124124
FF_GET_INSTANCE_IFDEF(optArgs, cv::Point2d offset, "offset", Point2::constructor, FF_UNWRAP_PT2_AND_GET, Point2, cv::Point2d());
@@ -135,7 +135,7 @@ NAN_METHOD(MatImgproc::DrawContours) {
135135
std::vector<std::vector<cv::Point>> contours;
136136
std::vector<cv::Vec4i> hierarchy;
137137
for (uint i = 0; i < jsContours->Length(); i++) {
138-
FF_OBJ jsContour = jsContours->Get(i)->ToObject();
138+
FF_OBJ jsContour = jsContours->Get(i)->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
139139
contours.push_back(FF_UNWRAP_CONTOUR_AND_GET(jsContour));
140140
hierarchy.push_back(FF_UNWRAP_CONTOUR(jsContour)->hierarchy);
141141
}

‎cc/core/MatImgprocBindings.h

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ namespace MatImgprocBindings {
7979
}
8080

8181
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
82-
FF_OBJ opts = info[getOptArgIndex(info)]->ToObject();
82+
FF_OBJ opts = info[getOptArgIndex(info)]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
8383
return (
8484
DoubleConverter::optProp(&fx, "fx", opts) ||
8585
DoubleConverter::optProp(&fy, "fy", opts) ||
@@ -318,11 +318,11 @@ namespace MatImgprocBindings {
318318
}
319319

320320
bool hasOptArgsObject(Nan::NAN_METHOD_ARGS_TYPE info) {
321-
return FF_ARG_IS_OBJECT(1) && !Size::Converter::hasInstance(info[1]->ToObject());
321+
return FF_ARG_IS_OBJECT(1) && !Size::Converter::hasInstance(info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked());
322322
}
323323

324324
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
325-
FF_OBJ opts = info[1]->ToObject();
325+
FF_OBJ opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
326326
return (
327327
Size::Converter::optProp(&size, "size", opts) ||
328328
IntConverter::optProp(&flags, "flags", opts) ||
@@ -393,12 +393,12 @@ namespace MatImgprocBindings {
393393

394394
bool hasOptArgsObject(Nan::NAN_METHOD_ARGS_TYPE info) {
395395
int optArgN = (withOp ? 2 : 1);
396-
return FF_ARG_IS_OBJECT(optArgN) && !Point2::Converter::hasInstance(info[optArgN]->ToObject());
396+
return FF_ARG_IS_OBJECT(optArgN) && !Point2::Converter::hasInstance(info[optArgN]->ToObject(Nan::GetCurrentContext()).ToLocalChecked());
397397
}
398398

399399
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
400400
int optArgN = (withOp ? 2 : 1);
401-
FF_OBJ opts = info[optArgN]->ToObject();
401+
FF_OBJ opts = info[optArgN]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
402402
return (
403403
Point2::Converter::optProp(&anchor, "anchor", opts) ||
404404
IntConverter::optProp(&iterations, "iterations", opts) ||
@@ -535,11 +535,11 @@ namespace MatImgprocBindings {
535535
}
536536

537537
bool hasOptArgsObject(Nan::NAN_METHOD_ARGS_TYPE info) {
538-
return FF_ARG_IS_OBJECT(1) && !Point2::Converter::hasInstance(info[1]->ToObject());
538+
return FF_ARG_IS_OBJECT(1) && !Point2::Converter::hasInstance(info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked());
539539
}
540540

541541
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
542-
FF_OBJ opts = info[1]->ToObject();
542+
FF_OBJ opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
543543
return (
544544
Point2::Converter::optProp(&anchor, "anchor", opts) ||
545545
IntConverter::optProp(&borderType, "borderType", opts)
@@ -590,7 +590,7 @@ namespace MatImgprocBindings {
590590
}
591591

592592
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
593-
FF_OBJ opts = info[2]->ToObject();
593+
FF_OBJ opts = info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
594594
return (
595595
DoubleConverter::optProp(&sigmaY, "sigmaY", opts) ||
596596
IntConverter::optProp(&borderType, "borderType", opts)
@@ -657,7 +657,7 @@ namespace MatImgprocBindings {
657657
}
658658

659659
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
660-
v8::Local<v8::Object> opts = info[0]->ToObject();
660+
v8::Local<v8::Object> opts = info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
661661
return (
662662
IntConverter::optProp(&connectivity, "connectivity", opts) ||
663663
IntConverter::optProp(&ltype, "ltype", opts)
@@ -862,7 +862,7 @@ namespace MatImgprocBindings {
862862
}
863863

864864
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
865-
v8::Local<v8::Object> opts = info[getDrawParamsIndex()]->ToObject();
865+
v8::Local<v8::Object> opts = info[getDrawParamsIndex()]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
866866
return (
867867
Vec3::Converter::optProp(&color, "color", opts) ||
868868
(hasThickness && IntConverter::optProp(&thickness, "thickness", opts)) ||
@@ -926,7 +926,7 @@ namespace MatImgprocBindings {
926926
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
927927
return (
928928
DrawWorker::unwrapOptionalArgsFromOpts(info) ||
929-
DoubleConverter::optProp(&tipLength, "tipLength", info[getDrawParamsIndex()]->ToObject())
929+
DoubleConverter::optProp(&tipLength, "tipLength", info[getDrawParamsIndex()]->ToObject(Nan::GetCurrentContext()).ToLocalChecked())
930930
);
931931
}
932932

@@ -1093,7 +1093,7 @@ namespace MatImgprocBindings {
10931093
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
10941094
return (
10951095
DrawWorker::unwrapOptionalArgsFromOpts(info) ||
1096-
Point2::Converter::optProp(&offset, "offset", info[getDrawParamsIndex()]->ToObject())
1096+
Point2::Converter::optProp(&offset, "offset", info[getDrawParamsIndex()]->ToObject(Nan::GetCurrentContext()).ToLocalChecked())
10971097
);
10981098
}
10991099

@@ -1158,7 +1158,7 @@ namespace MatImgprocBindings {
11581158
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
11591159
return (
11601160
DrawWorker::unwrapOptionalArgsFromOpts(info) ||
1161-
BoolConverter::optProp(&bottomLeftOrigin, "bottomLeftOrigin", info[getDrawParamsIndex()]->ToObject())
1161+
BoolConverter::optProp(&bottomLeftOrigin, "bottomLeftOrigin", info[getDrawParamsIndex()]->ToObject(Nan::GetCurrentContext()).ToLocalChecked())
11621162
);
11631163
}
11641164

@@ -1245,7 +1245,7 @@ namespace MatImgprocBindings {
12451245
}
12461246

12471247
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1248-
FF_OBJ opts = info[2]->ToObject();
1248+
FF_OBJ opts = info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
12491249
return (
12501250
IntConverter::optProp(&apertureSize, "apertureSize", opts) ||
12511251
BoolConverter::optProp(&L2gradient, "L2gradient", opts)
@@ -1300,7 +1300,7 @@ namespace MatImgprocBindings {
13001300
}
13011301

13021302
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1303-
FF_OBJ opts = info[3]->ToObject();
1303+
FF_OBJ opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
13041304
return (
13051305
(hasKsize && IntConverter::optProp(&ksize, "ksize", opts)) ||
13061306
DoubleConverter::optProp(&scale, "scale", opts) ||
@@ -1373,7 +1373,7 @@ namespace MatImgprocBindings {
13731373
}
13741374

13751375
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1376-
FF_OBJ opts = info[1]->ToObject();
1376+
FF_OBJ opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
13771377
return (
13781378
IntConverter::optProp(&ksize, "ksize", opts) ||
13791379
DoubleConverter::optProp(&scale, "scale", opts) ||
@@ -1428,7 +1428,7 @@ namespace MatImgprocBindings {
14281428
}
14291429

14301430
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1431-
FF_OBJ opts = info[0]->ToObject();
1431+
FF_OBJ opts = info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
14321432
return (
14331433
Size::Converter::optProp(&size, "size", opts) ||
14341434
IntConverter::optProp(&borderType, "borderType", opts)
@@ -1516,7 +1516,7 @@ namespace MatImgprocBindings {
15161516
}
15171517

15181518
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1519-
FF_OBJ opts = info[3]->ToObject();
1519+
FF_OBJ opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
15201520
return (
15211521
DoubleConverter::optProp(&srn, "srn", opts) ||
15221522
DoubleConverter::optProp(&stn, "stn", opts) ||
@@ -1557,7 +1557,7 @@ namespace MatImgprocBindings {
15571557
}
15581558

15591559
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1560-
FF_OBJ opts = info[3]->ToObject();
1560+
FF_OBJ opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
15611561
return (
15621562
DoubleConverter::optProp(&minLineLength, "minLineLength", opts) ||
15631563
DoubleConverter::optProp(&maxLineGap, "maxLineGap", opts)
@@ -1614,7 +1614,7 @@ namespace MatImgprocBindings {
16141614
}
16151615

16161616
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1617-
FF_OBJ opts = info[3]->ToObject();
1617+
FF_OBJ opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
16181618
return (
16191619
DoubleConverter::optProp(&param1, "param1", opts) ||
16201620
DoubleConverter::optProp(&param2, "param2", opts) ||
@@ -1740,7 +1740,7 @@ namespace MatImgprocBindings {
17401740
}
17411741

17421742
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1743-
v8::Local<v8::Object> opts = info[2]->ToObject();
1743+
v8::Local<v8::Object> opts = info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
17441744
return (
17451745
Mat::Converter::optProp(&mask, "mask", opts) ||
17461746
(self.channels() == 1 && DoubleConverter::optProp(&loDiff1, "loDiff", opts)) ||
@@ -1834,7 +1834,7 @@ namespace MatImgprocBindings {
18341834
}
18351835

18361836
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1837-
v8::Local<v8::Object> opts = info[2]->ToObject();
1837+
v8::Local<v8::Object> opts = info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
18381838
return (
18391839
Point2::Converter::optProp(&anchor, "anchor", opts) ||
18401840
BoolConverter::optProp(&normalize, "normalize", opts) ||
@@ -1898,7 +1898,7 @@ namespace MatImgprocBindings {
18981898
}
18991899

19001900
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1901-
v8::Local<v8::Object> opts = info[2]->ToObject();
1901+
v8::Local<v8::Object> opts = info[2]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
19021902
return (
19031903
Point2::Converter::optProp(&anchor, "anchor", opts) ||
19041904
DoubleConverter::optProp(&delta, "delta", opts) ||
@@ -1953,7 +1953,7 @@ namespace MatImgprocBindings {
19531953
}
19541954

19551955
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
1956-
v8::Local<v8::Object> opts = info[3]->ToObject();
1956+
v8::Local<v8::Object> opts = info[3]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
19571957
return (
19581958
Point2::Converter::optProp(&anchor, "anchor", opts) ||
19591959
DoubleConverter::optProp(&delta, "delta", opts) ||
@@ -2067,7 +2067,7 @@ namespace MatImgprocBindings {
20672067
}
20682068

20692069
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
2070-
v8::Local<v8::Object> opts = info[1]->ToObject();
2070+
v8::Local<v8::Object> opts = info[1]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
20712071
return (
20722072
IntConverter::optProp(&ksize, "ksize", opts) ||
20732073
IntConverter::optProp(&borderType, "borderType", opts)
@@ -2136,7 +2136,7 @@ namespace MatImgprocBindings {
21362136
}
21372137

21382138
bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
2139-
v8::Local<v8::Object> opts = info[0]->ToObject();
2139+
v8::Local<v8::Object> opts = info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();
21402140
return (
21412141
IntConverter::optProp(&sdepth, "sdepth", opts) ||
21422142
IntConverter::optProp(&sqdepth, "sqdepth", opts)

0 commit comments

Comments
 (0)