diff --git a/src/CamShift.cc b/src/CamShift.cc index 925c739..788a1a4 100644 --- a/src/CamShift.cc +++ b/src/CamShift.cc @@ -26,7 +26,6 @@ TrackedObject::Init(Handle target) { NODE_SET_PROTOTYPE_METHOD(ctor, "track", Track); - //target->Set(String::NewSymbol("TrackedObject"), constructor->GetFunction()); target->Set(NanNew("TrackedObject"), ctor->GetFunction()); }; diff --git a/src/CamShift.h b/src/CamShift.h index c79b090..d421fef 100644 --- a/src/CamShift.h +++ b/src/CamShift.h @@ -14,7 +14,6 @@ class TrackedObject: public node::ObjectWrap { static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); TrackedObject(cv::Mat image, cv::Rect rect, int channel); diff --git a/src/CascadeClassifierWrap.cc b/src/CascadeClassifierWrap.cc index 5c8b3d5..d2f8871 100755 --- a/src/CascadeClassifierWrap.cc +++ b/src/CascadeClassifierWrap.cc @@ -69,7 +69,6 @@ class AsyncDetectMultiScale : public NanAsyncWorker { void HandleOKCallback () { NanScope(); - // ev_unref(EV_DEFAULT_UC); // this->matrix->Unref(); v8::Local arr = NanNew(this->res.size()); @@ -107,17 +106,6 @@ class AsyncDetectMultiScale : public NanAsyncWorker { int sleep_for; std::vector res; - /* baton->cc = self; - baton->cb = Persistent::New(cb); - baton->im = im; - baton->scale = scale; - baton->neighbors = neighbors; - baton->minw = minw; - baton->minh = minh; - baton->sleep_for = 1; - baton->request.data = baton; -};*/ - }; @@ -150,13 +138,6 @@ NAN_METHOD(CascadeClassifierWrap::DetectMultiScale){ minh = args[5]->IntegerValue(); } -//FIXME: convert async - /* classifier_baton_t *baton = new classifier_baton_t(); - -// eio_custom(EIO_DetectMultiScale, EIO_PRI_DEFAULT, EIO_AfterDetectMultiScale, baton); -// ev_ref(EV_DEFAULT_UC); - - uv_queue_work(uv_default_loop(), &baton->request, AsyncDetectMultiScale, (uv_after_work_cb)AfterAsyncDetectMultiScale);*/ NanCallback *callback = new NanCallback(cb.As()); diff --git a/src/CascadeClassifierWrap.h b/src/CascadeClassifierWrap.h index fb3c033..36972d9 100755 --- a/src/CascadeClassifierWrap.h +++ b/src/CascadeClassifierWrap.h @@ -6,14 +6,12 @@ class CascadeClassifierWrap: public node::ObjectWrap { static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); CascadeClassifierWrap(v8::Value* fileName); - //static Handle LoadHaarClassifierCascade(const v8::Arguments&); + //static Handle LoadHaarClassifierCascade(const v8::Arguments&); - //static Handle DetectMultiScale(const v8::Arguments&); static NAN_METHOD(DetectMultiScale); static void EIO_DetectMultiScale(uv_work_t *req); diff --git a/src/Contours.cc b/src/Contours.cc index 1038220..786ca9b 100755 --- a/src/Contours.cc +++ b/src/Contours.cc @@ -12,7 +12,6 @@ Contour::Init(Handle target) { NanScope(); //Class/contructor - Local ctor = NanNew(Contour::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); @@ -21,8 +20,6 @@ Contour::Init(Handle target) { // Prototype //Local proto = constructor->PrototypeTemplate(); - - NODE_SET_PROTOTYPE_METHOD(ctor, "point", Point); NODE_SET_PROTOTYPE_METHOD(ctor, "size", Size); NODE_SET_PROTOTYPE_METHOD(ctor, "cornerCount", CornerCount); diff --git a/src/Contours.h b/src/Contours.h index e67c37b..36427a3 100755 --- a/src/Contours.h +++ b/src/Contours.h @@ -9,7 +9,6 @@ class Contour: public node::ObjectWrap { vector > contours; static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); Contour(); diff --git a/src/FaceRecognizer.h b/src/FaceRecognizer.h index 274d691..07a5afd 100644 --- a/src/FaceRecognizer.h +++ b/src/FaceRecognizer.h @@ -11,7 +11,6 @@ class FaceRecognizerWrap: public node::ObjectWrap { static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); FaceRecognizerWrap(cv::Ptr f, int type); diff --git a/src/HighGUI.cc b/src/HighGUI.cc index 52d4493..f2160b9 100644 --- a/src/HighGUI.cc +++ b/src/HighGUI.cc @@ -16,8 +16,6 @@ NamedWindow::Init(Handle target) { ctor->SetClassName(NanNew("NamedWindow")); // Prototype - //Local proto = constructor->PrototypeTemplate(); - NODE_SET_PROTOTYPE_METHOD(ctor, "show", Show); NODE_SET_PROTOTYPE_METHOD(ctor, "destroy", Destroy); NODE_SET_PROTOTYPE_METHOD(ctor, "blockingWaitKey", BlockingWaitKey); diff --git a/src/HighGUI.h b/src/HighGUI.h index faf4ab0..3a18e81 100644 --- a/src/HighGUI.h +++ b/src/HighGUI.h @@ -6,10 +6,8 @@ class NamedWindow: public node::ObjectWrap { std::string winname; int flags; - static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); NamedWindow(const std::string& winname, int flags); diff --git a/src/Matrix.cc b/src/Matrix.cc index 07646a9..8256d1d 100755 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -22,7 +22,6 @@ Matrix::Init(Handle target) { ctor->SetClassName(NanNew("Matrix")); // Prototype - NODE_SET_PROTOTYPE_METHOD(ctor, "row", Row); NODE_SET_PROTOTYPE_METHOD(ctor, "col", Col); @@ -279,7 +278,6 @@ NAN_METHOD(Matrix::Size){ NAN_METHOD(Matrix::Clone){ SETUP_FUNCTION(Matrix) - //Local constructorHandle = NanNew(Matrix::constructor); Local im_h = NanNew(Matrix::constructor)->GetFunction()->NewInstance(); Matrix *m = ObjectWrap::Unwrap(im_h); @@ -418,15 +416,12 @@ NAN_METHOD(Matrix::ToBuffer){ std::vector vec(0); - // We use operator * before the "ext" variable, because it converts String to char * - cv::imencode(ext, self->mat, vec, params); - //Local buf = NanNewBufferHandle((char*)closure->data, closure->len); - //memcpy(Buffer::Data(buf), closure->data, closure->len); + cv::imencode(ext, self->mat, vec, params); Local buf = NanNewBufferHandle(vec.size()); uchar* data = (uchar*) Buffer::Data(buf); - memcpy(data, &vec[0], vec.size());//dest, source, size + memcpy(data, &vec[0], vec.size()); v8::Local globalObj = NanGetCurrentContext()->Global(); v8::Local bufferConstructor = v8::Local::Cast(globalObj->Get(NanNew("Buffer"))); @@ -454,15 +449,12 @@ class AsyncToBufferWorker : public NanAsyncWorker { res = vec; } - // Executed when the async work is complete - // this function will be run inside the main event loop - // so it is safe to use V8 again void HandleOKCallback () { NanScope(); Local buf = NanNewBufferHandle(res.size()); uchar* data = (uchar*) Buffer::Data(buf); - memcpy(data, &res[0], res.size());//dest, source, size + memcpy(data, &res[0], res.size()); v8::Local globalObj = NanGetCurrentContext()->Global(); v8::Local bufferConstructor = v8::Local::Cast(globalObj->Get(NanNew("Buffer"))); @@ -485,7 +477,6 @@ class AsyncToBufferWorker : public NanAsyncWorker { private: Matrix* matrix; - //char* filename; std::string ext; std::vector params; std::vector res; diff --git a/src/Matrix.h b/src/Matrix.h index 4ccde47..5dac9e6 100755 --- a/src/Matrix.h +++ b/src/Matrix.h @@ -6,7 +6,6 @@ class Matrix: public node::ObjectWrap { cv::Mat mat; static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); Matrix(); Matrix(cv::Mat other, cv::Rect roi); diff --git a/src/Point.cc b/src/Point.cc index 3ee1d00..328f78c 100755 --- a/src/Point.cc +++ b/src/Point.cc @@ -9,23 +9,15 @@ Point::Init(Handle target) { NanScope(); // Constructor - /*constructor = Persistent::New(FunctionTemplate::New(Point::New)); - constructor->InstanceTemplate()->SetInternalFieldCount(1); - constructor->SetClassName(String::NewSymbol("Point")); - - // Prototype - Local proto = constructor->PrototypeTemplate(); - proto->SetAccessor(String::NewSymbol("x"), GetX, RaiseImmutable); - proto->SetAccessor(String::NewSymbol("y"), GetY, RaiseImmutable);*/ - Local ctor = NanNew(Point::New); NanAssignPersistent(constructor, ctor); ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->SetClassName(NanNew("Point")); + // Prototype Local proto = ctor->PrototypeTemplate(); - proto->SetAccessor(NanNew("x"), GetX, RaiseImmutable);//, RaiseImmutable); - proto->SetAccessor(NanNew("y"), GetY, RaiseImmutable);//, RaiseImmutable); + proto->SetAccessor(NanNew("x"), GetX, RaiseImmutable); + proto->SetAccessor(NanNew("y"), GetY, RaiseImmutable); NODE_SET_PROTOTYPE_METHOD(ctor, "dot", Dot); @@ -47,13 +39,13 @@ NAN_METHOD(Point::New) { NanReturnValue(args.This()); } -NAN_GETTER(Point::GetX){ //(Local prop, const AccessorInfo &info) { +NAN_GETTER(Point::GetX){ NanScope(); Point *pt = ObjectWrap::Unwrap(args.This()); NanReturnValue(NanNew(pt->point.x)); } -NAN_GETTER(Point::GetY){//(Local prop, const AccessorInfo &info) { +NAN_GETTER(Point::GetY){ NanScope(); Point *pt = ObjectWrap::Unwrap(args.This()); NanReturnValue(NanNew(pt->point.y)); diff --git a/src/VideoCaptureWrap.cc b/src/VideoCaptureWrap.cc index 05a55ff..89b17c0 100755 --- a/src/VideoCaptureWrap.cc +++ b/src/VideoCaptureWrap.cc @@ -6,9 +6,6 @@ using namespace std; -void AsyncRead(uv_work_t *req); -void AfterAsyncRead(uv_work_t *req); - v8::Persistent VideoCaptureWrap::constructor; struct videocapture_baton { diff --git a/src/VideoCaptureWrap.h b/src/VideoCaptureWrap.h index 1118cec..02c2cf8 100755 --- a/src/VideoCaptureWrap.h +++ b/src/VideoCaptureWrap.h @@ -6,35 +6,24 @@ class VideoCaptureWrap: public node::ObjectWrap { static Persistent constructor; static void Init(Handle target); - //static Handle New(const Arguments &args); static NAN_METHOD(New); VideoCaptureWrap(const std::string& filename); VideoCaptureWrap(int device); - //static Handle Read(const v8::Arguments&); static NAN_METHOD(Read); + static NAN_METHOD(ReadSync); //(Optional) For setting width and height of the input video stream - //static Handle SetWidth(const v8::Arguments&); static NAN_METHOD(SetWidth); - - //static Handle SetHeight(const v8::Arguments&); static NAN_METHOD(SetHeight); // to set frame position - //static Handle SetPosition(const v8::Arguments&); static NAN_METHOD(SetPosition); - //static Handle GetFrameAt(const v8::Arguments&); static NAN_METHOD(GetFrameAt); //close the stream - //static Handle Close(const v8::Arguments&); static NAN_METHOD(Close); - - //experimental - //static Handle ReadSync(const v8::Arguments&); - static NAN_METHOD(ReadSync); };