archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

resize: move async fn to last argument

Browse Source
This commit is contained in:
Simon Hailes 2017-11-02 09:44:57 +00:00
parent b67c96ee31
commit 44f175632c
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Matrix.cc
View File

@ -1971,18 +1971,25 @@ NAN_METHOD(Matrix::Resize) {
return Nan::ThrowError("Matrix.resize requires at least 2 argument2"); return Nan::ThrowError("Matrix.resize requires at least 2 argument2");
} }
// if we want async //im.resize( width, height );
int offset = 0; //im.resize( width, height, fx, fy );
if (info[0]->IsFunction()){ //im.resize( width, height, interpolation );
offset = 1; //im.resize( width, height, fx, fy, interpolation );
// if fn is added on the end, makes it Async
int numargs = info.Length();
int isAsync = 0;
if (info[numargs-1]->IsFunction()){
isAsync = 1;
} }
if (info.Length() < 2+offset) { if (info.Length() < 2+isAsync) {
return Nan::ThrowError("Matrix.resize requires at least x and y size argument2"); return Nan::ThrowError("Matrix.resize requires at least x and y size argument2");
} }
int x = info[offset+0]->Uint32Value(); int x = info[0]->Uint32Value();
int y = info[offset+1]->Uint32Value(); int y = info[1]->Uint32Value();
cv::Size size(x, y); cv::Size size(x, y);
@ -1995,22 +2002,22 @@ NAN_METHOD(Matrix::Resize) {
int interpolation = cv::INTER_LINEAR; int interpolation = cv::INTER_LINEAR;
// if 4 or more args, then expect fx, fy next // if 4 or more args, then expect fx, fy next
if (info.Length() >= 4+offset) { if (numargs >= 4+isAsync) {
DOUBLE_FROM_ARGS(fx, 2+offset) DOUBLE_FROM_ARGS(fx, 2)
DOUBLE_FROM_ARGS(fy, 3+offset) DOUBLE_FROM_ARGS(fy, 3)
if (numargs == 5+isAsync) {
INT_FROM_ARGS(interpolation, 5)
} }
} else {
// if 3 args after possible function, expect interpolation // if 3 args after possible function, expect interpolation
if (info.Length() == 3+offset) { if (numargs == 3+isAsync) {
INT_FROM_ARGS(interpolation, 3+offset) INT_FROM_ARGS(interpolation, 3)
} }
if (info.Length() == 5+offset) {
INT_FROM_ARGS(interpolation, 5+offset)
} }
// if async // if async
if (offset){ if (isAsync){
REQ_FUN_ARG(0, cb); REQ_FUN_ARG(numargs-1, cb);
Nan::Callback *callback = new Nan::Callback(cb.As<Function>()); Nan::Callback *callback = new Nan::Callback(cb.As<Function>());
Nan::AsyncQueueWorker(new ResizeASyncWorker(callback, self, size, fx, fy, interpolation)); Nan::AsyncQueueWorker(new ResizeASyncWorker(callback, self, size, fx, fy, interpolation));
info.GetReturnValue().Set(Nan::Null()); info.GetReturnValue().Set(Nan::Null());