diff --git a/package.json b/package.json index 357626d..88dda82 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "main": "./lib/opencv", "repository": { "type": "git", - "url": "https://github.com/keeganbrown/node-opencv.git" + "url": "https://github.com/peterbraden/node-opencv.git" }, "engines": { "node": ">=0.12" diff --git a/src/BackgroundSubtractor.cc b/src/BackgroundSubtractor.cc index 7bf1741..69b703d 100644 --- a/src/BackgroundSubtractor.cc +++ b/src/BackgroundSubtractor.cc @@ -7,7 +7,7 @@ Nan::Persistent BackgroundSubtractorWrap::constructor; -void BackgroundSubtractorWrap::Init(Handle target) { +void BackgroundSubtractorWrap::Init(Local target) { Nan::HandleScope scope; // Constructor diff --git a/src/BackgroundSubtractor.h b/src/BackgroundSubtractor.h index b237699..551d212 100644 --- a/src/BackgroundSubtractor.h +++ b/src/BackgroundSubtractor.h @@ -9,7 +9,7 @@ public: cv::Ptr subtractor; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); BackgroundSubtractorWrap(cv::Ptr bg); diff --git a/src/Calib3D.cc b/src/Calib3D.cc index a49ed31..885cbeb 100644 --- a/src/Calib3D.cc +++ b/src/Calib3D.cc @@ -10,12 +10,12 @@ inline Local matrixFromMat(cv::Mat &input) { return matrixWrap; } -inline cv::Mat matFromMatrix(Handle matrix) { +inline cv::Mat matFromMatrix(Local matrix) { Matrix* m = Nan::ObjectWrap::Unwrap(matrix->ToObject()); return m->mat; } -inline cv::Size sizeFromArray(Handle jsArray) { +inline cv::Size sizeFromArray(Local jsArray) { cv::Size patternSize; if (jsArray->IsArray()) { @@ -30,7 +30,7 @@ inline cv::Size sizeFromArray(Handle jsArray) { return patternSize; } -inline std::vector points2fFromArray(Handle array) { +inline std::vector points2fFromArray(Local array) { std::vector points; if (array->IsArray()) { Local pointsArray = Local::Cast(array->ToObject()); @@ -48,7 +48,7 @@ inline std::vector points2fFromArray(Handle array) { return points; } -inline std::vector points3fFromArray(Handle array) { +inline std::vector points3fFromArray(Local array) { std::vector points; if (array->IsArray()) { Local pointsArray = Local::Cast(array->ToObject()); @@ -68,7 +68,7 @@ inline std::vector points3fFromArray(Handle array) { } inline std::vector > points2fFromArrayOfArrays( - Handle array) { + Local array) { std::vector > points; if (array->IsArray()) { Local pointsArray = Local::Cast(array->ToObject()); @@ -84,7 +84,7 @@ inline std::vector > points2fFromArrayOfArrays( } inline std::vector > points3fFromArrayOfArrays( - Handle array) { + Local array) { std::vector > points; if (array->IsArray()) { Local pointsArray = Local::Cast(array->ToObject()); @@ -99,7 +99,7 @@ inline std::vector > points3fFromArrayOfArrays( return points; } -void Calib3D::Init(Handle target) { +void Calib3D::Init(Local target) { Nan::Persistent inner; Local obj = Nan::New(); inner.Reset(obj); diff --git a/src/Calib3D.h b/src/Calib3D.h index 9617757..7d94943 100644 --- a/src/Calib3D.h +++ b/src/Calib3D.h @@ -8,7 +8,7 @@ */ class Calib3D: public Nan::ObjectWrap { public: - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(FindChessboardCorners); static NAN_METHOD(DrawChessboardCorners); static NAN_METHOD(CalibrateCamera); diff --git a/src/CamShift.cc b/src/CamShift.cc index 5e08324..fed246a 100644 --- a/src/CamShift.cc +++ b/src/CamShift.cc @@ -10,7 +10,7 @@ Nan::Persistent TrackedObject::constructor; -void TrackedObject::Init(Handle target) { +void TrackedObject::Init(Local target) { Nan::HandleScope scope; // Constructor diff --git a/src/CamShift.h b/src/CamShift.h index ac049f3..7524408 100644 --- a/src/CamShift.h +++ b/src/CamShift.h @@ -13,7 +13,7 @@ public: cv::Rect prev_rect; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); TrackedObject(cv::Mat image, cv::Rect rect, int channel); diff --git a/src/CascadeClassifierWrap.cc b/src/CascadeClassifierWrap.cc index 49d347f..9642722 100755 --- a/src/CascadeClassifierWrap.cc +++ b/src/CascadeClassifierWrap.cc @@ -5,7 +5,7 @@ Nan::Persistent CascadeClassifierWrap::constructor; -void CascadeClassifierWrap::Init(Handle target) { +void CascadeClassifierWrap::Init(Local target) { Nan::HandleScope scope; Local ctor = Nan::New (CascadeClassifierWrap::New); diff --git a/src/CascadeClassifierWrap.h b/src/CascadeClassifierWrap.h index c0016d9..0f80ba1 100755 --- a/src/CascadeClassifierWrap.h +++ b/src/CascadeClassifierWrap.h @@ -5,7 +5,7 @@ public: cv::CascadeClassifier cc; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); CascadeClassifierWrap(v8::Value* fileName); diff --git a/src/Constants.cc b/src/Constants.cc index 5d9fa22..814cd65 100644 --- a/src/Constants.cc +++ b/src/Constants.cc @@ -7,7 +7,7 @@ #define CONST_ENUM(C) \ obj->Set(Nan::New(#C).ToLocalChecked(), Nan::New((int)(cv::C))); -void Constants::Init(Handle target) { +void Constants::Init(Local target) { Nan::Persistent inner; Local obj = Nan::New(); inner.Reset(obj); diff --git a/src/Constants.h b/src/Constants.h index 9bb818e..2a2a580 100644 --- a/src/Constants.h +++ b/src/Constants.h @@ -2,5 +2,5 @@ class Constants: public Nan::ObjectWrap { public: - static void Init(Handle target); + static void Init(Local target); }; diff --git a/src/Contours.cc b/src/Contours.cc index f8eb726..406140a 100755 --- a/src/Contours.cc +++ b/src/Contours.cc @@ -6,7 +6,7 @@ Nan::Persistent Contour::constructor; -void Contour::Init(Handle target) { +void Contour::Init(Local target) { Nan::HandleScope scope; // Class/contructor @@ -331,21 +331,21 @@ NAN_METHOD(Contour::Deserialize) { Contour *self = Nan::ObjectWrap::Unwrap(info.This()); - Handle data = Handle::Cast(info[0]); + Local data = Local::Cast(info[0]); - Handle contours_data = Handle::Cast(data->Get(Nan::New("contours").ToLocalChecked())); - Handle hierarchy_data = Handle::Cast(data->Get(Nan::New("hierarchy").ToLocalChecked())); + Local contours_data = Local::Cast(data->Get(Nan::New("contours").ToLocalChecked())); + Local hierarchy_data = Local::Cast(data->Get(Nan::New("hierarchy").ToLocalChecked())); vector > contours_res; int contours_length = contours_data->Length(); for (int i = 0; i < contours_length; i++) { - Handle contour_data = Handle::Cast(contours_data->Get(i)); + Local contour_data = Local::Cast(contours_data->Get(i)); vector points; int contour_length = contour_data->Length(); for (int j = 0; j < contour_length; j++) { - Handle point_data = Handle::Cast(contour_data->Get(j)); + Local point_data = Local::Cast(contour_data->Get(j)); int x = point_data->Get(0)->IntegerValue(); int y = point_data->Get(1)->IntegerValue(); points.push_back(cv::Point(x, y)); @@ -358,7 +358,7 @@ NAN_METHOD(Contour::Deserialize) { int hierarchy_length = hierarchy_data->Length(); for (int i = 0; i < hierarchy_length; i++) { - Handle contour_data = Handle::Cast(hierarchy_data->Get(i)); + Local contour_data = Local::Cast(hierarchy_data->Get(i)); int a = contour_data->Get(0)->IntegerValue(); int b = contour_data->Get(1)->IntegerValue(); int c = contour_data->Get(2)->IntegerValue(); diff --git a/src/Contours.h b/src/Contours.h index b1a496a..cbbff01 100755 --- a/src/Contours.h +++ b/src/Contours.h @@ -9,7 +9,7 @@ public: vector hierarchy; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); Contour(); diff --git a/src/Features2d.cc b/src/Features2d.cc index d6c7179..596ce98 100644 --- a/src/Features2d.cc +++ b/src/Features2d.cc @@ -5,7 +5,7 @@ #if ((CV_MAJOR_VERSION >= 2) && (CV_MINOR_VERSION >=4)) -void Features::Init(Handle target) { +void Features::Init(Local target) { Nan::HandleScope scope; Nan::SetMethod(target, "ImageSimilarity", Similarity); diff --git a/src/Features2d.h b/src/Features2d.h index 600f646..6ae2b21 100644 --- a/src/Features2d.h +++ b/src/Features2d.h @@ -8,7 +8,7 @@ class Features: public Nan::ObjectWrap { public: static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(Similarity); }; diff --git a/src/HighGUI.cc b/src/HighGUI.cc index b43fb89..b61b1fa 100644 --- a/src/HighGUI.cc +++ b/src/HighGUI.cc @@ -4,7 +4,7 @@ Nan::Persistent NamedWindow::constructor; -void NamedWindow::Init(Handle target) { +void NamedWindow::Init(Local target) { Nan::HandleScope scope; // Constructor diff --git a/src/HighGUI.h b/src/HighGUI.h index 9b7019a..d47bc4b 100644 --- a/src/HighGUI.h +++ b/src/HighGUI.h @@ -6,7 +6,7 @@ public: int flags; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); NamedWindow(const std::string& winname, int flags); diff --git a/src/ImgProc.cc b/src/ImgProc.cc index b84e20a..719fd8b 100644 --- a/src/ImgProc.cc +++ b/src/ImgProc.cc @@ -1,7 +1,7 @@ #include "ImgProc.h" #include "Matrix.h" -void ImgProc::Init(Handle target) { +void ImgProc::Init(Local target) { Nan::Persistent inner; Local obj = Nan::New(); inner.Reset(obj); diff --git a/src/ImgProc.h b/src/ImgProc.h index a73220a..a1ef503 100644 --- a/src/ImgProc.h +++ b/src/ImgProc.h @@ -8,7 +8,7 @@ */ class ImgProc: public Nan::ObjectWrap { public: - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(Undistort); static NAN_METHOD(InitUndistortRectifyMap); static NAN_METHOD(Remap); diff --git a/src/Matrix.cc b/src/Matrix.cc index 0be152a..1396781 100755 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -9,7 +9,7 @@ cv::Scalar setColor(Local objColor); cv::Point setPoint(Local objPoint); cv::Rect* setRect(Local objRect, cv::Rect &result); -void Matrix::Init(Handle target) { +void Matrix::Init(Local target) { Nan::HandleScope scope; //Class @@ -312,7 +312,7 @@ NAN_METHOD(Matrix::GetData) { v8::Local globalObj = Nan::GetCurrentContext()->Global(); v8::Local bufferConstructor = v8::Local::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked())); - v8::Handle constructorArgs[3] = {buf, Nan::New((unsigned) size), Nan::New(0)}; + v8::Local constructorArgs[3] = {buf, Nan::New((unsigned) size), Nan::New(0)}; v8::Local actualBuffer = bufferConstructor->NewInstance(3, constructorArgs); info.GetReturnValue().Set(actualBuffer); @@ -566,7 +566,7 @@ NAN_METHOD(Matrix::ToBuffer) { // See if the options argument is passed if ((info.Length() > 0) && (info[0]->IsObject())) { // Get this options argument - v8::Handle < v8::Object > options = v8::Handle::Cast(info[0]); + v8::Handle < v8::Object > options = v8::Local::Cast(info[0]); // If the extension (image format) is provided if (options->Has(Nan::New("ext").ToLocalChecked())) { v8::String::Utf8Value str( @@ -600,7 +600,7 @@ NAN_METHOD(Matrix::ToBuffer) { v8::Local < v8::Object > globalObj = Nan::GetCurrentContext()->Global(); v8::Local < v8::Function > bufferConstructor = v8::Local < v8::Function > ::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked())); - v8::Handle constructorArgs[3] = + v8::Local constructorArgs[3] = {buf, Nan::New((unsigned)vec.size()), Nan::New(0)}; v8::Local < v8::Object > actualBuffer = bufferConstructor->NewInstance(3, constructorArgs); @@ -637,7 +637,7 @@ public: v8::Local globalObj = Nan::GetCurrentContext()->Global(); v8::Local bufferConstructor = v8::Local::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked())); - v8::Handle constructorArgs[3] = {buf, Nan::New((unsigned)res.size()), Nan::New(0)}; + v8::Local constructorArgs[3] = {buf, Nan::New((unsigned)res.size()), Nan::New(0)}; v8::Local actualBuffer = bufferConstructor->NewInstance(3, constructorArgs); Local argv[] = { @@ -671,7 +671,7 @@ NAN_METHOD(Matrix::ToBufferAsync) { // See if the options argument is passed if ((info.Length() > 1) && (info[1]->IsObject())) { // Get this options argument - v8::Handle < v8::Object > options = v8::Handle::Cast(info[1]); + v8::Handle < v8::Object > options = v8::Local::Cast(info[1]); // If the extension (image format) is provided if (options->Has(Nan::New("ext").ToLocalChecked())) { v8::String::Utf8Value str( @@ -715,7 +715,7 @@ NAN_METHOD(Matrix::Ellipse) { int shift = 0; if (info[0]->IsObject()) { - v8::Handle < v8::Object > options = v8::Handle::Cast(info[0]); + v8::Handle < v8::Object > options = v8::Local::Cast(info[0]); if (options->Has(Nan::New("center").ToLocalChecked())) { Local < Object > center = options->Get(Nan::New("center").ToLocalChecked())->ToObject(); @@ -1818,7 +1818,7 @@ NAN_METHOD(Matrix::Merge) { if (!info[0]->IsArray()) { Nan::ThrowTypeError("The argument must be an array"); } - v8::Handle jsChannels = v8::Handle::Cast(info[0]); + v8::Local jsChannels = v8::Local::Cast(info[0]); unsigned int L = jsChannels->Length(); vector vChannels(L); diff --git a/src/Matrix.h b/src/Matrix.h index 3c87b38..826b12e 100755 --- a/src/Matrix.h +++ b/src/Matrix.h @@ -5,7 +5,7 @@ public: cv::Mat mat; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); Matrix(); Matrix(cv::Mat other, cv::Rect roi); diff --git a/src/OpenCV.cc b/src/OpenCV.cc index 8365138..20692df 100755 --- a/src/OpenCV.cc +++ b/src/OpenCV.cc @@ -2,7 +2,7 @@ #include "Matrix.h" #include -void OpenCV::Init(Handle target) { +void OpenCV::Init(Local target) { Nan::HandleScope scope; // Version string. diff --git a/src/OpenCV.h b/src/OpenCV.h index 6e368ae..0d8eb90 100755 --- a/src/OpenCV.h +++ b/src/OpenCV.h @@ -44,7 +44,7 @@ using namespace node; class OpenCV: public Nan::ObjectWrap { public: - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(ReadImage); }; diff --git a/src/Point.cc b/src/Point.cc index 060029d..d1ce841 100755 --- a/src/Point.cc +++ b/src/Point.cc @@ -3,7 +3,7 @@ Nan::Persistent Point::constructor; -void Point::Init(Handle target) { +void Point::Init(Local target) { Nan::HandleScope scope; // Constructor diff --git a/src/Point.h b/src/Point.h index d72bf60..3a5dc06 100755 --- a/src/Point.h +++ b/src/Point.h @@ -6,7 +6,7 @@ class Point: public Nan::ObjectWrap { public: CvPoint2D32f point; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); Point(double x, double y); diff --git a/src/Stereo.cc b/src/Stereo.cc index b5f83f5..f8d1c11 100644 --- a/src/Stereo.cc +++ b/src/Stereo.cc @@ -6,7 +6,7 @@ Nan::Persistent StereoBM::constructor; -void StereoBM::Init(Handle target) { +void StereoBM::Init(Local target) { Nan::HandleScope scope; Local ctor = Nan::New(StereoBM::New); @@ -98,7 +98,7 @@ NAN_METHOD(StereoBM::Compute) { // Semi-Global Block matching Nan::Persistent StereoSGBM::constructor; -void StereoSGBM::Init(Handle target) { +void StereoSGBM::Init(Local target) { Nan::HandleScope scope; Local ctor = Nan::New(StereoSGBM::New); @@ -233,7 +233,7 @@ NAN_METHOD(StereoSGBM::Compute) { Nan::Persistent StereoGC::constructor; -void StereoGC::Init(Handle target) { +void StereoGC::Init(Local target) { Nan::HandleScope scope; Local ctor = Nan::New(StereoGC::New); diff --git a/src/Stereo.h b/src/Stereo.h index a26a8f8..fbbdb58 100644 --- a/src/Stereo.h +++ b/src/Stereo.h @@ -8,7 +8,7 @@ public: cv::StereoBM stereo; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); StereoBM(int preset = cv::StereoBM::BASIC_PRESET, int ndisparities = 0, @@ -23,7 +23,7 @@ public: cv::StereoSGBM stereo; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); StereoSGBM(); @@ -42,7 +42,7 @@ public: CvStereoGCState *stereo; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); StereoGC(int numberOfDisparities = 16, int maxIterations = 2); diff --git a/src/VideoCaptureWrap.cc b/src/VideoCaptureWrap.cc index ca6da1c..cb4fcfd 100755 --- a/src/VideoCaptureWrap.cc +++ b/src/VideoCaptureWrap.cc @@ -16,7 +16,7 @@ struct videocapture_baton { uv_work_t request; }; -void VideoCaptureWrap::Init(Handle target) { +void VideoCaptureWrap::Init(Local target) { Nan::HandleScope scope; //Class diff --git a/src/VideoCaptureWrap.h b/src/VideoCaptureWrap.h index a9b3b03..3cb5a04 100755 --- a/src/VideoCaptureWrap.h +++ b/src/VideoCaptureWrap.h @@ -5,7 +5,7 @@ public: cv::VideoCapture cap; static Nan::Persistent constructor; - static void Init(Handle target); + static void Init(Local target); static NAN_METHOD(New); VideoCaptureWrap(const std::string& filename); diff --git a/src/init.cc b/src/init.cc index 9e1b2fc..44a7c3b 100755 --- a/src/init.cc +++ b/src/init.cc @@ -15,7 +15,7 @@ #include "Stereo.h" #include "BackgroundSubtractor.h" -extern "C" void init(Handle target) { +extern "C" void init(Local target) { Nan::HandleScope scope; OpenCV::Init(target);