summaryrefslogtreecommitdiff
path: root/macros/ImageProcessing/highgui/CV_ShowImage.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/ImageProcessing/highgui/CV_ShowImage.sci')
-rw-r--r--macros/ImageProcessing/highgui/CV_ShowImage.sci25
1 files changed, 25 insertions, 0 deletions
diff --git a/macros/ImageProcessing/highgui/CV_ShowImage.sci b/macros/ImageProcessing/highgui/CV_ShowImage.sci
index 4bfe5913..24621f39 100644
--- a/macros/ImageProcessing/highgui/CV_ShowImage.sci
+++ b/macros/ImageProcessing/highgui/CV_ShowImage.sci
@@ -12,6 +12,27 @@ function CV_ShowImage(winname,img)
// function to show an image
//
// Calling Sequence
+<<<<<<< HEAD
+// 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
+//
+// This is curretly dummy function. It provides no functionality but is required
+// for providing support for generating C code for OpenCV
+//
+// Examples
+// img = CV_LoadImage('~/test.jpg',0)
+// CV_ShowImage(img)
+// See also
+// CV_CreateImage CV_LoadImage
+//
+=======
// CV_ShowImage(img)
// CV_ShowImage(winname,img)
//
@@ -29,11 +50,15 @@ function CV_ShowImage(winname,img)
// 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