Merge branch 'waitkey' into beta

This commit is contained in:
Peter Braden 2013-03-11 15:41:58 -07:00
commit ebd1f6e4e8
3 changed files with 17 additions and 3 deletions

View File

@ -4,9 +4,9 @@ var win = new cv.NamedWindow("foo");
cv.readImage('./examples/stuff.png', function(e, im){
im.pyrDown();
win.show(im);
setTimeout(function(){
win.destroy();
}, 1000)
console.log(win.blockingWaitKey(0), "!!")
win.destroy();
})

View File

@ -19,6 +19,7 @@ NamedWindow::Init(Handle<Object> target) {
NODE_SET_PROTOTYPE_METHOD(constructor, "show", Show);
NODE_SET_PROTOTYPE_METHOD(constructor, "destroy", Destroy);
NODE_SET_PROTOTYPE_METHOD(constructor, "blockingWaitKey", BlockingWaitKey);
target->Set(String::NewSymbol("NamedWindow"), constructor->GetFunction());
};
@ -65,3 +66,15 @@ NamedWindow::Destroy(const v8::Arguments& args){
cv::destroyWindow(self->winname);
return scope.Close(args.Holder());
}
Handle<Value>
NamedWindow::BlockingWaitKey(const v8::Arguments& args){
SETUP_FUNCTION(NamedWindow)
int time = 0;
if (args.Length() > 0){
time = args[1]->IntegerValue();
}
int res = cv::waitKey(time);
return scope.Close(Number::New(res));
}

View File

@ -15,5 +15,6 @@ class NamedWindow: public node::ObjectWrap {
JSFUNC(Show);
JSFUNC(Destroy);
JSFUNC(BlockingWaitKey);
};