diff options
Diffstat (limited to '2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci')
| -rw-r--r-- | 2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci index 46fd91f1..858ca7a3 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci +++ b/2.3-1/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 |