- continued work migrating api to nan

src/BackgroundSubtractor.cc

@@ -21,8 +21,7 @@ BackgroundSubtractorWrap::Init(Handle<Object> target) {
     target->Set(String::NewSymbol("BackgroundSubtractor"), constructor->GetFunction());
 };
 
-Handle<Value>
-BackgroundSubtractorWrap::New(const Arguments &args) {
+NAN_METHOD(BackgroundSubtractorWrap::New() {
   HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0)
@@ -37,8 +36,7 @@ BackgroundSubtractorWrap::New(const Arguments &args) {
   return args.This();
 }
 
-Handle<Value>
-BackgroundSubtractorWrap::CreateMOG(const Arguments &args) {
+NAN_METHOD(BackgroundSubtractorWrap::CreateMOG() {
   HandleScope scope;
 
   int history = 200;
@@ -63,8 +61,7 @@ BackgroundSubtractorWrap::CreateMOG(const Arguments &args) {
 };
 
 //Fetch foreground mask
-Handle<Value>
-BackgroundSubtractorWrap::ApplyMOG(const Arguments &args) {
+NAN_METHOD(BackgroundSubtractorWrap::ApplyMOG() {
 
   SETUP_FUNCTION(BackgroundSubtractorWrap)
 
@@ -134,4 +131,4 @@ BackgroundSubtractorWrap::BackgroundSubtractorWrap(cv::Ptr<cv::BackgroundSubtrac
   subtractor = _subtractor;
 };
 
-#endif
+#endif

src/CamShift.cc

@@ -27,8 +27,7 @@ TrackedObject::Init(Handle<Object> target) {
 };    
 
 
-Handle<Value>
-TrackedObject::New(const Arguments &args) {
+NAN_METHOD(TrackedObject::New() {
   HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0){
@@ -120,8 +119,7 @@ TrackedObject::TrackedObject(cv::Mat image, cv::Rect rect, int chan){
 
 
 
-Handle<Value>
-TrackedObject::Track(const v8::Arguments& args){
+NAN_METHOD(TrackedObject::Track(const v8::Arguments& args){
 	SETUP_FUNCTION(TrackedObject)
  
   if (args.Length() != 1){

src/CascadeClassifierWrap.cc

@@ -27,8 +27,7 @@ CascadeClassifierWrap::Init(Handle<Object> target) {
     target->Set(String::NewSymbol("CascadeClassifier"), constructor->GetFunction());
 };    
 
-Handle<Value>
-CascadeClassifierWrap::New(const Arguments &args) {
+NAN_METHOD(CascadeClassifierWrap::New() {
   HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0)
@@ -65,8 +64,7 @@ struct classifier_baton_t {
 };
 
 
-Handle<Value>
-CascadeClassifierWrap::DetectMultiScale(const v8::Arguments& args){
+NAN_METHOD(CascadeClassifierWrap::DetectMultiScale){
   HandleScope scope;
 
   CascadeClassifierWrap *self =  ObjectWrap::Unwrap<CascadeClassifierWrap>(args.This());

src/Contours.cc

@@ -38,8 +38,7 @@ Contour::Init(Handle<Object> target) {
 };
 
 
-Handle<Value>
-Contour::New(const Arguments &args) {
+NAN_METHOD(Contour::New() {
 	HandleScope scope;
 
 	if (args.This()->InternalFieldCount() == 0)
@@ -57,8 +56,7 @@ Contour::Contour(): ObjectWrap() {
 }
 
 
-Handle<Value>
-Contour::Point(const Arguments &args) {
+NAN_METHOD(Contour::Point() {
 	HandleScope scope;
 
 		Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -77,8 +75,7 @@ Contour::Point(const Arguments &args) {
 // FIXME: this sould better be called "Length" as ``Contours`` is an Array like structure
 // also, this would allow to use ``Size`` for the function returning the number of corners
 // in the contour for better consistency with OpenCV.
-Handle<Value>
-Contour::Size(const Arguments &args) {
+NAN_METHOD(Contour::Size() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -86,8 +83,7 @@ Contour::Size(const Arguments &args) {
 	return scope.Close(Number::New(self->contours.size()));
 }
 
-Handle<Value>
-Contour::CornerCount(const Arguments &args) {
+NAN_METHOD(Contour::CornerCount() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -96,8 +92,7 @@ Contour::CornerCount(const Arguments &args) {
 	return scope.Close(Number::New(self->contours[pos].size()));
 }
 
-Handle<Value>
-Contour::Area(const Arguments &args) {
+NAN_METHOD(Contour::Area() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -108,8 +103,7 @@ Contour::Area(const Arguments &args) {
 }
 
 
-Handle<Value>
-Contour::ArcLength(const Arguments &args) {
+NAN_METHOD(Contour::ArcLength() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -120,8 +114,7 @@ Contour::ArcLength(const Arguments &args) {
 }
 
 
-Handle<Value>
-Contour::ApproxPolyDP(const Arguments &args) {
+NAN_METHOD(Contour::ApproxPolyDP() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -137,8 +130,7 @@ Contour::ApproxPolyDP(const Arguments &args) {
 }
 
 
-Handle<Value>
-Contour::ConvexHull(const Arguments &args) {
+NAN_METHOD(Contour::ConvexHull() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -154,8 +146,7 @@ Contour::ConvexHull(const Arguments &args) {
 }
 
 
-Handle<Value>
-Contour::BoundingRect(const Arguments &args) {
+NAN_METHOD(Contour::BoundingRect() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -173,8 +164,7 @@ Contour::BoundingRect(const Arguments &args) {
 }
 
 
-Handle<Value>
-Contour::MinAreaRect(const Arguments &args) {
+NAN_METHOD(Contour::MinAreaRect() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -212,8 +202,7 @@ Contour::MinAreaRect(const Arguments &args) {
 }
 
 
-Handle<Value>
-Contour::IsConvex(const Arguments &args) {
+NAN_METHOD(Contour::IsConvex() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());
@@ -222,8 +211,7 @@ Contour::IsConvex(const Arguments &args) {
 	return scope.Close(Boolean::New(isContourConvex(cv::Mat(self->contours[pos]))));
 }
 
-Handle<Value>
-Contour::Moments(const Arguments &args) {
+NAN_METHOD(Contour::Moments() {
 	HandleScope scope;
 
 	Contour *self = ObjectWrap::Unwrap<Contour>(args.This());

src/FaceRecognizer.cc

@@ -53,8 +53,7 @@ FaceRecognizerWrap::Init(Handle<Object> target) {
     target->Set(String::NewSymbol("FaceRecognizer"), constructor->GetFunction());
 };
 
-Handle<Value>
-FaceRecognizerWrap::New(const Arguments &args) {
+NAN_METHOD(FaceRecognizerWrap::New() {
   HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0)
@@ -68,8 +67,7 @@ FaceRecognizerWrap::New(const Arguments &args) {
   return args.This();
 }
 
-Handle<Value>
-FaceRecognizerWrap::CreateLBPH(const Arguments &args) {
+NAN_METHOD(FaceRecognizerWrap::CreateLBPH() {
   HandleScope scope;
 
   int radius = 1;
@@ -95,8 +93,7 @@ FaceRecognizerWrap::CreateLBPH(const Arguments &args) {
   return n;
 }
 
-Handle<Value>
-FaceRecognizerWrap::CreateEigen(const Arguments &args) {
+NAN_METHOD(FaceRecognizerWrap::CreateEigen() {
   HandleScope scope;
 
   int components = 0;
@@ -116,8 +113,7 @@ FaceRecognizerWrap::CreateEigen(const Arguments &args) {
   return n;
 }
 
-Handle<Value>
-FaceRecognizerWrap::CreateFisher(const Arguments &args) {
+NAN_METHOD(FaceRecognizerWrap::CreateFisher() {
   HandleScope scope;
 
   int components = 0;
@@ -177,8 +173,7 @@ Handle<Value> UnwrapTrainingData(const Arguments& args, cv::vector<cv::Mat>* ima
   return v8::Undefined();
 }
 
-Handle<Value>
-FaceRecognizerWrap::TrainSync(const Arguments& args){
+NAN_METHOD(FaceRecognizerWrap::TrainSync(const Arguments& args){
 	SETUP_FUNCTION(FaceRecognizerWrap)
 
   cv::vector<cv::Mat> images;
@@ -194,8 +189,7 @@ FaceRecognizerWrap::TrainSync(const Arguments& args){
   return scope.Close(v8::Undefined());
 }
 
-Handle<Value>
-FaceRecognizerWrap::UpdateSync(const Arguments& args){
+NAN_METHOD(FaceRecognizerWrap::UpdateSync(const Arguments& args){
 	SETUP_FUNCTION(FaceRecognizerWrap)
 
 
@@ -221,8 +215,7 @@ FaceRecognizerWrap::UpdateSync(const Arguments& args){
 }
 
 
-Handle<Value>
-FaceRecognizerWrap::PredictSync(const Arguments& args){
+NAN_METHOD(FaceRecognizerWrap::PredictSync(const Arguments& args){
 	SETUP_FUNCTION(FaceRecognizerWrap)
 
   cv::Mat im = fromMatrixOrFilename(args[0]);//TODO CHECK!
@@ -241,8 +234,7 @@ FaceRecognizerWrap::PredictSync(const Arguments& args){
 }
 
 
-Handle<Value>
-FaceRecognizerWrap::SaveSync(const Arguments& args){
+NAN_METHOD(FaceRecognizerWrap::SaveSync(const Arguments& args){
 	SETUP_FUNCTION(FaceRecognizerWrap)
   if (!args[0]->IsString()){
     JSTHROW("Save takes a filename")
@@ -252,8 +244,7 @@ FaceRecognizerWrap::SaveSync(const Arguments& args){
   return v8::Undefined();
 }
 
-Handle<Value>
-FaceRecognizerWrap::LoadSync(const Arguments& args){
+NAN_METHOD(FaceRecognizerWrap::LoadSync(const Arguments& args){
 	SETUP_FUNCTION(FaceRecognizerWrap)
   if (!args[0]->IsString()){
     JSTHROW("Load takes a filename")
@@ -263,8 +254,7 @@ FaceRecognizerWrap::LoadSync(const Arguments& args){
   return v8::Undefined();
 }
 
-Handle<Value>
-FaceRecognizerWrap::GetMat(const Arguments& args){
+NAN_METHOD(FaceRecognizerWrap::GetMat(const Arguments& args){
 	SETUP_FUNCTION(FaceRecognizerWrap)
   if (!args[0]->IsString()){
     JSTHROW("getMat takes a key")

src/HighGUI.cc

@@ -24,8 +24,7 @@ NamedWindow::Init(Handle<Object> target) {
 };
 
 
-Handle<Value>
-NamedWindow::New(const Arguments &args) {
+NAN_METHOD(NamedWindow::New() {
   HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0){
@@ -51,8 +50,7 @@ NamedWindow::NamedWindow(const std::string& name, int f){
 }
 
 
-Handle<Value>
-NamedWindow::Show(const v8::Arguments& args){
+NAN_METHOD(NamedWindow::Show(const v8::Arguments& args){
 	SETUP_FUNCTION(NamedWindow)
   Matrix *im = ObjectWrap::Unwrap<Matrix>(args[0]->ToObject());
   cv::imshow(self->winname, im->mat);
@@ -60,16 +58,14 @@ NamedWindow::Show(const v8::Arguments& args){
 	return scope.Close(args.Holder());
 }
 
-Handle<Value>
-NamedWindow::Destroy(const v8::Arguments& args){
+NAN_METHOD(NamedWindow::Destroy(const v8::Arguments& args){
 	SETUP_FUNCTION(NamedWindow)
   cv::destroyWindow(self->winname);
 	return scope.Close(args.Holder());
 }
 
 
-Handle<Value>
-NamedWindow::BlockingWaitKey(const v8::Arguments& args){
+NAN_METHOD(NamedWindow::BlockingWaitKey(const v8::Arguments& args){
   HandleScope scope;
 	//SETUP_FUNCTION(NamedWindow)
 	int time = 0;

src/OpenCV.cc

@@ -18,7 +18,7 @@ OpenCV::Init(Handle<Object> target) {
 
 
 Handle<Value>
-OpenCV::ReadImage(const Arguments &args) {
+OpenCV::ReadImage() {
   HandleScope scope;
 
   try{

src/OpenCV.h

@@ -22,11 +22,11 @@ using namespace node;
 
 
 #define SETUP_FUNCTION(TYP)	\
-	HandleScope scope;		\
+	NanScope();		\
 	TYP *self = ObjectWrap::Unwrap<TYP>(args.This());
 
 #define JSFUNC(NAME) \
-  NAN_METHOD(NAME);
+  static NAN_METHOD(NAME);
 	//static Handle<Value> NAME(const Arguments& args); 
 
 #define JSTHROW_TYPE(ERR) \

src/Point.cc

@@ -23,8 +23,7 @@ Point::Init(Handle<Object> target) {
     target->Set(String::NewSymbol("Point"), constructor->GetFunction());
 };    
 
-Handle<Value>
-Point::New(const Arguments &args) {
+NAN_METHOD(Point::New() {
   HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0)
@@ -38,15 +37,13 @@ Point::New(const Arguments &args) {
   return args.This();
 }
 
-Handle<Value>
-Point::GetX(Local<String> prop, const AccessorInfo &info) {
+NAN_METHOD(Point::GetX(Local<String> prop, const AccessorInfo &info) {
   HandleScope scope;
   Point *pt = ObjectWrap::Unwrap<Point>(info.This());
   return scope.Close(Number::New(pt->point.x));
 }
 
-Handle<Value>
-Point::GetY(Local<String> prop, const AccessorInfo &info) {
+NAN_METHOD(Point::GetY(Local<String> prop, const AccessorInfo &info) {
   HandleScope scope;
   Point *pt = ObjectWrap::Unwrap<Point>(info.This());
   return scope.Close(Number::New(pt->point.y));
@@ -57,8 +54,7 @@ Point::RaiseImmutable(Local<String> property, Local<Value> value, const Accessor
   v8::ThrowException(v8::Exception::TypeError(v8::String::New("Point is immutable")));
 }  
 
-Handle<Value>
-Point::Dot(const v8::Arguments& args){
+NAN_METHOD(Point::Dot(const v8::Arguments& args){
   HandleScope scope;
   Point *p1 = ObjectWrap::Unwrap<Point>(args.This());
   Point *p2 = ObjectWrap::Unwrap<Point>(args[0]->ToObject());

src/VideoCaptureWrap.cc

@@ -43,8 +43,7 @@ VideoCaptureWrap::Init(Handle<Object> target) {
 	target->Set(String::NewSymbol("VideoCapture"), constructor->GetFunction());
 };    
 
-Handle<Value>
-VideoCaptureWrap::New(const Arguments &args) {
+NAN_METHOD(VideoCaptureWrap::New() {
 	HandleScope scope;
 
   if (args.This()->InternalFieldCount() == 0)
@@ -85,8 +84,7 @@ VideoCaptureWrap::VideoCaptureWrap(const std::string& filename){
 
 }
 
-Handle<Value>
-VideoCaptureWrap::SetWidth(const Arguments &args){
+NAN_METHOD(VideoCaptureWrap::SetWidth(){
 
 	HandleScope scope;
 	VideoCaptureWrap *v = ObjectWrap::Unwrap<VideoCaptureWrap>(args.This());
@@ -102,8 +100,7 @@ VideoCaptureWrap::SetWidth(const Arguments &args){
 	return scope.Close(Undefined());
 }
 
-Handle<Value>
-VideoCaptureWrap::SetHeight(const Arguments &args){
+NAN_METHOD(VideoCaptureWrap::SetHeight(){
 
 	HandleScope scope;
 	VideoCaptureWrap *v = ObjectWrap::Unwrap<VideoCaptureWrap>(args.This());
@@ -118,8 +115,7 @@ VideoCaptureWrap::SetHeight(const Arguments &args){
 	return Undefined();
 }
 
-Handle<Value>
-VideoCaptureWrap::SetPosition(const Arguments &args){
+NAN_METHOD(VideoCaptureWrap::SetPosition(){
 
 	HandleScope scope;
 	VideoCaptureWrap *v = ObjectWrap::Unwrap<VideoCaptureWrap>(args.This());
@@ -134,8 +130,7 @@ VideoCaptureWrap::SetPosition(const Arguments &args){
 	return Undefined();
 }
 
-Handle<Value>
-VideoCaptureWrap::Close(const Arguments &args){
+NAN_METHOD(VideoCaptureWrap::Close(){
 
 	HandleScope scope;
 	VideoCaptureWrap *v = ObjectWrap::Unwrap<VideoCaptureWrap>(args.This());
@@ -145,8 +140,7 @@ VideoCaptureWrap::Close(const Arguments &args){
 	return Undefined();
 }
 
-Handle<Value>
-VideoCaptureWrap::Read(const Arguments &args) {
+NAN_METHOD(VideoCaptureWrap::Read() {
 
 	HandleScope scope;
 	VideoCaptureWrap *v = ObjectWrap::Unwrap<VideoCaptureWrap>(args.This());
@@ -197,8 +191,7 @@ void AfterAsyncRead(uv_work_t *req) {
 
 
 
-Handle<Value>
-VideoCaptureWrap::ReadSync(const Arguments &args) {
+NAN_METHOD(VideoCaptureWrap::ReadSync() {
 
 	HandleScope scope;
 	VideoCaptureWrap *v = ObjectWrap::Unwrap<VideoCaptureWrap>(args.This());