From ae5887c4cd21a145124074bd45164657fc325053 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Wed, 11 Feb 2015 19:44:38 +0100 Subject: [PATCH] Use Nan for rest of the method --- src/Matrix.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Matrix.cc b/src/Matrix.cc index d1f5382..1f0b9d9 100755 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -1750,7 +1750,7 @@ NAN_METHOD(Matrix::TemplateMatches){ cv::sortIdx(self->mat.reshape(0,1), indices, CV_SORT_DESCENDING + CV_SORT_EVERY_ROW); cv::Mat hit_mask = cv::Mat::zeros(self->mat.size(), CV_64F); - v8::Local probabilites_array = v8::Array::New(); + v8::Local probabilites_array = NanNew(limit); cv::Mat_::const_iterator begin = self->mat.begin(); cv::Mat_::const_iterator it = indices.begin(); @@ -1789,20 +1789,20 @@ NAN_METHOD(Matrix::TemplateMatches){ cv::rectangle(hit_mask, top_left, bottom_right, color, CV_FILLED); } - Local x_value = v8::Number::New(pt.x); - Local y_value = v8::Number::New(pt.y); - Local probability_value = v8::Number::New(probability); + Local x_value = NanNew(pt.x); + Local y_value = NanNew(pt.y); + Local probability_value = NanNew(probability); - Local probability_object = Object::New(); - probability_object->Set(String::NewSymbol("x"), x_value); - probability_object->Set(String::NewSymbol("y"), y_value); - probability_object->Set(String::NewSymbol("probability"), probability_value); + Local probability_object = NanNew(); + probability_object->Set(NanNew("x"), x_value); + probability_object->Set(NanNew("y"), y_value); + probability_object->Set(NanNew("probability"), probability_value); probabilites_array->Set(index, probability_object); index++; } - return scope.Close(probabilites_array); + NanReturnValue(probabilites_array); } // @author ytham