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

Commit b1f1228

Browse files
justadudewhohacksjustadudewhohacks
authored
Merge pull request justadudewhohacks#483 from justadudewhohacks/fix-compiler-warnings
Fix compiler warnings
2 parents 9155fa1 + 6ab5ce7 commit b1f1228

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+396
-371
lines changed

‎cc/core/Mat.cc

+22-22
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ NAN_METHOD(Mat::New) {
160160
/* data array, type */
161161
else if (info.Length() == 2 && info[0]->IsArray() && info[1]->IsInt32()) {
162162
FF_ARR rowArray = FF_ARR::Cast(info[0]);
163-
int type = info[1]->Int32Value();
163+
int type = info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value();
164164

165165
long numCols = -1;
166166
for (uint i = 0; i < rowArray->Length(); i++) {
@@ -180,8 +180,8 @@ NAN_METHOD(Mat::New) {
180180
}
181181
/* row, col, type */
182182
else if (info[0]->IsNumber() && info[1]->IsNumber() && info[2]->IsInt32()) {
183-
int type = info[2]->Int32Value();
184-
cv::Mat mat(info[0]->Int32Value(), info[1]->Int32Value(), type);
183+
int type = info[2]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value();
184+
cv::Mat mat(info[0]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), type);
185185
/* fill vector */
186186
// TODO by Vec
187187
if (info[3]->IsArray()) {
@@ -201,9 +201,9 @@ NAN_METHOD(Mat::New) {
201201
}
202202
/* raw data, row, col, type */
203203
else if (info.Length() == 4 && info[1]->IsNumber() && info[2]->IsNumber() && info[3]->IsInt32()) {
204-
int type = info[3]->Int32Value();
205-
char *data = static_cast<char *>(node::Buffer::Data(info[0]->ToObject()));
206-
cv::Mat mat(info[1]->Int32Value(), info[2]->Int32Value(), type);
204+
int type = info[3]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value();
205+
char *data = static_cast<char *>(node::Buffer::Data(info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked()));
206+
cv::Mat mat(info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), info[2]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), type);
207207
size_t size = mat.rows * mat.cols * mat.elemSize();
208208
memcpy(mat.data, data, size);
209209
self->setNativeProps(mat);
@@ -251,8 +251,8 @@ NAN_METHOD(Mat::At) {
251251
}
252252
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, val, matSelf.type(), FF_MAT_AT_ARRAY, FF::matGet);
253253
} else {
254-
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.size[0] - 1, "Mat::At row");
255-
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.size[1] - 1, "Mat::At col");
254+
FF_ASSERT_INDEX_RANGE(info[0]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), matSelf.size[0] - 1, "Mat::At row");
255+
FF_ASSERT_INDEX_RANGE(info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), matSelf.size[1] - 1, "Mat::At col");
256256
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, val, matSelf.type(), FF_MAT_AT, FF::matGet);
257257
}
258258

@@ -261,15 +261,15 @@ NAN_METHOD(Mat::At) {
261261
FF_OBJ jsVec;
262262
if (vec->Length() == 2) {
263263
jsVec = FF_NEW_INSTANCE(Vec2::constructor);
264-
FF_UNWRAP_VEC2(jsVec)->vec = cv::Vec2d(vec->Get(0)->NumberValue(), vec->Get(1)->NumberValue());
264+
FF_UNWRAP_VEC2(jsVec)->vec = cv::Vec2d(vec->Get(0)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value(), vec->Get(1)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value());
265265
}
266266
else if (vec->Length() == 3) {
267267
jsVec = FF_NEW_INSTANCE(Vec3::constructor);
268-
FF_UNWRAP_VEC3(jsVec)->vec = cv::Vec3d(vec->Get(0)->NumberValue(), vec->Get(1)->NumberValue(), vec->Get(2)->NumberValue());
268+
FF_UNWRAP_VEC3(jsVec)->vec = cv::Vec3d(vec->Get(0)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value(), vec->Get(1)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value(), vec->Get(2)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value());
269269
}
270270
else {
271271
jsVec = FF_NEW_INSTANCE(Vec4::constructor);
272-
FF_UNWRAP_VEC4(jsVec)->vec = cv::Vec4d(vec->Get(0)->NumberValue(), vec->Get(1)->NumberValue(), vec->Get(2)->NumberValue(), vec->Get(3)->NumberValue());
272+
FF_UNWRAP_VEC4(jsVec)->vec = cv::Vec4d(vec->Get(0)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value(), vec->Get(1)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value(), vec->Get(2)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value(), vec->Get(3)->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value());
273273
}
274274
jsVal = jsVec;
275275
}
@@ -282,8 +282,8 @@ NAN_METHOD(Mat::At) {
282282
NAN_METHOD(Mat::AtRaw) {
283283
FF_METHOD_CONTEXT("Mat::AtRaw");
284284
cv::Mat matSelf = FF_UNWRAP_MAT_AND_GET(info.This());
285-
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.size[0] - 1, "Mat::At row");
286-
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.size[1] - 1, "Mat::At col");
285+
FF_ASSERT_INDEX_RANGE(info[0]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), matSelf.size[0] - 1, "Mat::At row");
286+
FF_ASSERT_INDEX_RANGE(info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), matSelf.size[1] - 1, "Mat::At col");
287287
v8::Local<v8::Value> val;
288288
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, val, matSelf.type(), FF_MAT_AT, FF::matGet);
289289
FF_RETURN(val);
@@ -292,8 +292,8 @@ NAN_METHOD(Mat::AtRaw) {
292292
NAN_METHOD(Mat::Set) {
293293
FF_METHOD_CONTEXT("Mat::Set");
294294
cv::Mat matSelf = FF_UNWRAP_MAT_AND_GET(info.This());
295-
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.size[0] - 1, "Mat::At row");
296-
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.size[1] - 1, "Mat::At col");
295+
FF_ASSERT_INDEX_RANGE(info[0]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), matSelf.size[0] - 1, "Mat::At row");
296+
FF_ASSERT_INDEX_RANGE(info[1]->ToInt32(Nan::GetCurrentContext()).ToLocalChecked()->Value(), matSelf.size[1] - 1, "Mat::At col");
297297

298298
int cn = matSelf.channels();
299299
if (info[2]->IsArray()) {
@@ -303,15 +303,15 @@ NAN_METHOD(Mat::Set) {
303303
}
304304
else if (FF_IS_INSTANCE(Vec2::constructor, info[2])) {
305305
FF_ASSERT_CHANNELS(cn, 2, "Mat::Set");
306-
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<2>(FF_UNWRAP_VEC2_AND_GET(info[2]->ToObject())), matSelf.type(), FF_MAT_SET, FF::matPut);
306+
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);
307307
}
308308
else if (FF_IS_INSTANCE(Vec3::constructor, info[2])) {
309309
FF_ASSERT_CHANNELS(cn, 3, "Mat::Set");
310-
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<3>(FF_UNWRAP_VEC3_AND_GET(info[2]->ToObject())), matSelf.type(), FF_MAT_SET, FF::matPut);
310+
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);
311311
}
312312
else if (FF_IS_INSTANCE(Vec4::constructor, info[2])) {
313313
FF_ASSERT_CHANNELS(cn, 4, "Mat::Set");
314-
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, FF::vecToJsArr<4>(FF_UNWRAP_VEC4_AND_GET(info[2]->ToObject())), matSelf.type(), FF_MAT_SET, FF::matPut);
314+
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);
315315
}
316316
else if (info[2]->IsNumber()) {
317317
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, info[2], matSelf.type(), FF_MAT_SET, FF::matPut);
@@ -352,7 +352,7 @@ NAN_METHOD(Mat::GetRegion) {
352352
if (!FF_IS_INSTANCE(Rect::constructor, info[0])) {
353353
return Nan::ThrowError("Mat::GetRegion expected arg0 to be an instance of Rect");
354354
}
355-
cv::Rect2d rect = FF_UNWRAP(info[0]->ToObject(), Rect)->rect;
355+
cv::Rect2d rect = FF_UNWRAP(info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked(), Rect)->rect;
356356
FF_OBJ jsRegion = FF_NEW_INSTANCE(constructor);
357357
FF_UNWRAP_MAT_AND_GET(jsRegion) = FF_UNWRAP_MAT_AND_GET(info.This())(rect);
358358
FF_RETURN(jsRegion);
@@ -367,7 +367,7 @@ NAN_METHOD(Mat::Norm) {
367367

368368
// optional args
369369
bool hasOptArgsObj = FF_HAS_ARG((long)i) && info[i]->IsObject();
370-
FF_OBJ optArgs = hasOptArgsObj ? info[i]->ToObject() : FF_NEW_OBJ();
370+
FF_OBJ optArgs = hasOptArgsObj ? info[i]->ToObject(Nan::GetCurrentContext()).ToLocalChecked() : FF_NEW_OBJ();
371371
FF_GET_UINT_IFDEF(optArgs, uint normType, "normType", cv::NORM_L2);
372372
FF_GET_INSTANCE_IFDEF(optArgs, cv::Mat mask, "mask", Mat::constructor, FF_UNWRAP_MAT_AND_GET, Mat, cv::noArray().getMat());
373373
if (!hasOptArgsObj) {
@@ -390,7 +390,7 @@ NAN_METHOD(Mat::Normalize) {
390390

391391
// optional args
392392
bool hasOptArgsObj = FF_HAS_ARG(0) && info[0]->IsObject();
393-
FF_OBJ optArgs = hasOptArgsObj ? info[0]->ToObject() : FF_NEW_OBJ();
393+
FF_OBJ optArgs = hasOptArgsObj ? info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked() : FF_NEW_OBJ();
394394
FF_GET_NUMBER_IFDEF(optArgs, double alpha, "alpha", 1.0);
395395
FF_GET_NUMBER_IFDEF(optArgs, double beta, "beta", 0.0);
396396
FF_GET_UINT_IFDEF(optArgs, uint normType, "normType", cv::NORM_L2);
@@ -413,7 +413,7 @@ NAN_METHOD(Mat::Row) {
413413
if (!info[0]->IsNumber()) {
414414
return Nan::ThrowError("usage: row(int r)");
415415
}
416-
int r = (int)info[0]->NumberValue();
416+
int r = (int)info[0]->ToNumber(Nan::GetCurrentContext()).ToLocalChecked()->Value();
417417
cv::Mat mat = Nan::ObjectWrap::Unwrap<Mat>(info.This())->mat;
418418
FF_ARR row = FF_NEW_ARRAY(mat.cols);
419419
try {

‎cc/core/MatBindings.h

+6-6
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

+4-4
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

+2-2
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
}

0 commit comments

Comments
 (0)