diff --git a/src/Contours.cc b/src/Contours.cc index 2193c23..b2f8d04 100755 --- a/src/Contours.cc +++ b/src/Contours.cc @@ -31,7 +31,7 @@ Contour::Init(Handle target) { NODE_SET_PROTOTYPE_METHOD(constructor, "approxPolyDP", ApproxPolyDP); NODE_SET_PROTOTYPE_METHOD(constructor, "convexHull", ConvexHull); NODE_SET_PROTOTYPE_METHOD(constructor, "boundingRect", BoundingRect); - NODE_SET_PROTOTYPE_METHOD(constructor, "minAreaRect", BoundingRect); + NODE_SET_PROTOTYPE_METHOD(constructor, "minAreaRect", MinAreaRect); NODE_SET_PROTOTYPE_METHOD(constructor, "isConvex", IsConvex); NODE_SET_PROTOTYPE_METHOD(constructor, "moments", Moments); target->Set(String::NewSymbol("Contours"), m->GetFunction()); diff --git a/src/Matrix.cc b/src/Matrix.cc index 5b0f960..caf347a 100755 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -67,6 +67,7 @@ Matrix::Init(Handle target) { NODE_SET_PROTOTYPE_METHOD(constructor, "absDiff", AbsDiff); NODE_SET_PROTOTYPE_METHOD(constructor, "addWeighted", AddWeighted); NODE_SET_PROTOTYPE_METHOD(constructor, "bitwiseXor", BitwiseXor); + NODE_SET_PROTOTYPE_METHOD(constructor, "bitwiseNot", BitwiseNot); NODE_SET_PROTOTYPE_METHOD(constructor, "countNonZero", CountNonZero); NODE_SET_PROTOTYPE_METHOD(constructor, "canny", Canny); NODE_SET_PROTOTYPE_METHOD(constructor, "dilate", Dilate); @@ -999,6 +1000,18 @@ Matrix::BitwiseXor(const v8::Arguments& args) { return scope.Close(v8::Null()); } +Handle +Matrix::BitwiseNot(const v8::Arguments& args) { + HandleScope scope; + + Matrix *self = ObjectWrap::Unwrap(args.This()); + + Matrix *src1 = ObjectWrap::Unwrap(args[0]->ToObject()); + cv::bitwise_not(src1->mat, self->mat); + + return scope.Close(v8::Null()); +} + Handle Matrix::CountNonZero(const v8::Arguments& args) { HandleScope scope; @@ -1755,7 +1768,9 @@ Matrix::PutText(const v8::Arguments& args) { color = setColor(objColor); } - cv::putText(self->mat, text, cv::Point(x, y), constFont, 1, color, 2); + double scale = args.Length() < 6 ? 1 : args[5]->NumberValue(); + + cv::putText(self->mat, text, cv::Point(x, y), constFont, scale, color, 2); return scope.Close(Undefined()); } diff --git a/src/Matrix.h b/src/Matrix.h index 7257093..af35f19 100755 --- a/src/Matrix.h +++ b/src/Matrix.h @@ -3,7 +3,7 @@ class Matrix: public node::ObjectWrap { public: - cv::Mat mat; + cv::Mat mat; static Persistent constructor; static void Init(Handle target); static Handle New(const Arguments &args); @@ -57,6 +57,7 @@ class Matrix: public node::ObjectWrap { JSFUNC(AbsDiff) JSFUNC(AddWeighted) JSFUNC(BitwiseXor) + JSFUNC(BitwiseNot) JSFUNC(CountNonZero) //JSFUNC(Split) JSFUNC(Canny) @@ -97,13 +98,13 @@ class Matrix: public node::ObjectWrap { JSFUNC(GetPerspectiveTransform) JSFUNC(WarpPerspective) /* - static Handle Val(const Arguments& args); - static Handle RowRange(const Arguments& args); - static Handle ColRange(const Arguments& args); - static Handle Diag(const Arguments& args); - static Handle Clone(const Arguments& args); - static Handle CopyTo(const Arguments& args); - static Handle ConvertTo(const Arguments& args); + static Handle Val(const Arguments& args); + static Handle RowRange(const Arguments& args); + static Handle ColRange(const Arguments& args); + static Handle Diag(const Arguments& args); + static Handle Clone(const Arguments& args); + static Handle CopyTo(const Arguments& args); + static Handle ConvertTo(const Arguments& args); static Handle AssignTo(const Arguments& args); static Handle SetTo(const Arguments& args); static Handle Reshape(const Arguments& args);