diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /macros/ImageProcessing/highgui/CV_WaitKey.sci | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/ImageProcessing/highgui/CV_WaitKey.sci')
| -rw-r--r-- | macros/ImageProcessing/highgui/CV_WaitKey.sci | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/macros/ImageProcessing/highgui/CV_WaitKey.sci b/macros/ImageProcessing/highgui/CV_WaitKey.sci index 46fd91f1..858ca7a3 100644 --- a/macros/ImageProcessing/highgui/CV_WaitKey.sci +++ b/macros/ImageProcessing/highgui/CV_WaitKey.sci @@ -15,6 +15,7 @@ function CV_WaitKey(delay) // CV_WaitKey(delay) // // Parameters +<<<<<<< HEAD // delay: waiting delay, if 0 then wait till keypress // // Description @@ -31,9 +32,30 @@ function CV_WaitKey(delay) // See also // CV_LoadImage CV_ShowImage // +======= +// delay: waiting delay, if 0 then wait till keypress +// +// Description +// This function can be used for inseting some delay. This function must +// follow CV_ShowImage to display image. +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// CV_ShowImage('',img) +// CV_WaitKey(0); +// +// See also +// CV_LoadImage CV_ShowImage +// +// +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Authors // Siddhesh Wani // +<<<<<<< HEAD +======= +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction |