diff options
Diffstat (limited to '2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci')
| -rw-r--r-- | 2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci index 2300d256..24621f39 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci @@ -12,6 +12,7 @@ function CV_ShowImage(winname,img) // function to show an image // // Calling Sequence +<<<<<<< HEAD // CV_ShowImage(img) // CV_ShowImage(winname,img) // @@ -31,9 +32,33 @@ function CV_ShowImage(winname,img) // See also // CV_CreateImage CV_LoadImage // +======= +// CV_ShowImage(img) +// CV_ShowImage(winname,img) +// +// Parameters +// winname: name of window in which img is to be shown +// img: image to be shown already acquired (from file/camera) +// +// Description +// This function can be used for showing images +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// CV_ShowImage(img) +// +// See also +// CV_CreateImage CV_LoadImage +// +// +>>>>>>> 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 |