archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into oskardahlberg-templateMatches

Browse Source
This commit is contained in:
Peter Braden 2015-02-11 18:47:04 +01:00
commit c5bd3e89bd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CascadeClassifierWrap.cc
View File

@ -50,7 +50,7 @@ CascadeClassifierWrap::CascadeClassifierWrap(v8::Value* fileName){
class AsyncDetectMultiScale : public NanAsyncWorker { class AsyncDetectMultiScale : public NanAsyncWorker {
public: public:
AsyncDetectMultiScale(NanCallback *callback, CascadeClassifierWrap *cc, Matrix* im, double scale, int neighbors, int minw, int minh, int sleep_for) : NanAsyncWorker(callback), cc(cc), im(im), scale(scale), neighbors(neighbors), minw(minw), minh(minh), sleep_for(sleep_for) {} AsyncDetectMultiScale(NanCallback *callback, CascadeClassifierWrap *cc, Matrix* im, double scale, int neighbors, int minw, int minh) : NanAsyncWorker(callback), cc(cc), im(im), scale(scale), neighbors(neighbors), minw(minw), minh(minh) {}
~AsyncDetectMultiScale() {} ~AsyncDetectMultiScale() {}
void Execute () { void Execute () {
@ -103,7 +103,6 @@ class AsyncDetectMultiScale : public NanAsyncWorker {
int neighbors; int neighbors;
int minw; int minw;
int minh; int minh;
int sleep_for;
std::vector<cv::Rect> res; std::vector<cv::Rect> res;
}; };
@ -141,7 +140,7 @@ NAN_METHOD(CascadeClassifierWrap::DetectMultiScale){
NanCallback *callback = new NanCallback(cb.As<Function>()); NanCallback *callback = new NanCallback(cb.As<Function>());
NanAsyncQueueWorker( new AsyncDetectMultiScale(callback, self, im, scale, neighbors, minw, minh, 1) ); NanAsyncQueueWorker( new AsyncDetectMultiScale(callback, self, im, scale, neighbors, minw, minh) );
NanReturnUndefined(); NanReturnUndefined();
} }