5 files changed, 96 insertions, 0 deletions
diff --git a/macros/ImageProcessing/highgui/CV_LoadImage.sci b/macros/ImageProcessing/highgui/CV_LoadImage.sci
index 01dda12..48a77fa 100644
--- a/macros/ImageProcessing/highgui/CV_LoadImage.sci
+++ b/macros/ImageProcessing/highgui/CV_LoadImage.sci
@@ -16,6 +16,33 @@ function img = CV_LoadImage(filename,loadtype)
 //
 // Parameters
 //     filename: name of file to be opened
+<<<<<<< HEAD
+//     loadtype: desired load method
+//
+// Description
+//	This function can be used for loading a previously stored image
+//	
+//	loadtype can take the following values:
+//	<itemizedlist>
+//	<listitem><para> less than 0 -> image is loaded as is (with alpha channel)</para></listitem>
+//	<listitem><para> 0 -> image is loaded as greyscale</para></listitem>
+//	<listitem><para> greater than 0 -> 3 channel color image is loaded</para></listitem>
+//	</itemizedlist>
+//
+// This is curretly dummy function. It provides no functionality but is required 
+// for providing support for generating C code for OpenCV
+//
+// Examples
+//	CV_LoadImage('~/test.jpg',0)
+// See also
+//     CV_CreateImage
+//
+// Authors
+//     Siddhesh Wani
+//
+
+img = 0;
+=======
 //	   loadtype: desired load method
 //			<0 --> image is loaded as is (with alpha channel)
 //			=0 --> image is loaded as greyscale
@@ -36,5 +63,6 @@ function img = CV_LoadImage(filename,loadtype)
 img = 0;
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for OpenCV
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction
diff --git a/macros/ImageProcessing/highgui/CV_SaveImage.sci b/macros/ImageProcessing/highgui/CV_SaveImage.sci
index 708edff..999c634 100644
--- a/macros/ImageProcessing/highgui/CV_SaveImage.sci
+++ b/macros/ImageProcessing/highgui/CV_SaveImage.sci
@@ -15,6 +15,21 @@ function status = CV_SaveImage(filename,img)
 //     CV_SaveImage(filename,img)
 //
 // Parameters
+<<<<<<< HEAD
+//	filename: name of file image to be saved as
+//	img: image to be saved
+//
+// Description
+//	This function can be used for saving image. File format is detected
+//	from file extension 
+//
+// 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_SaveImage('test1.png',img)
+=======
 //     filename: name of file image to be saved as
 //	   img: image to be saved
 //
@@ -25,14 +40,20 @@ function status = CV_SaveImage(filename,img)
 //		img = CV_LoadImage('~/test.jpg',0)
 //		CV_SaveImage('test1.png',img)
 //
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CreateImage
 //
 // Authors
 //     Siddhesh Wani
 //
+<<<<<<< HEAD
+
+status = 0;
+=======
 status = 0;
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for OpenCV
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction
diff --git a/macros/ImageProcessing/highgui/CV_ShowImage.sci b/macros/ImageProcessing/highgui/CV_ShowImage.sci
index 4bfe591..24621f3 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
diff --git a/macros/ImageProcessing/highgui/CV_WaitKey.sci b/macros/ImageProcessing/highgui/CV_WaitKey.sci
index 0facaaf..858ca7a 100644
--- a/macros/ImageProcessing/highgui/CV_WaitKey.sci
+++ b/macros/ImageProcessing/highgui/CV_WaitKey.sci
@@ -15,6 +15,24 @@ function CV_WaitKey(delay)
 //     CV_WaitKey(delay)
 //
 // Parameters
+<<<<<<< HEAD
+//	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. 
+//
+// 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)
+//	CV_WaitKey(0);
+// See also
+//     CV_LoadImage CV_ShowImage
+//
+=======
 //		delay: waiting delay, if 0 then wait till keypress
 //
 // Description
@@ -29,11 +47,15 @@ function CV_WaitKey(delay)
 //     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
diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib
index 3021760..722a150 100644
--- a/macros/ImageProcessing/highgui/lib
+++ b/macros/ImageProcessing/highgui/lib