Revert "SCi2cDeps updated, Windows compatibility resolved"

17 files changed, 0 insertions, 465 deletions

diff --git a/macros/ImageProcessing/core/CV_CreateImage.sci b/macros/ImageProcessing/core/CV_CreateImage.sci
index 62410c8..90b4578 100644
--- a/macros/ImageProcessing/core/CV_CreateImage.sci
+++ b/macros/ImageProcessing/core/CV_CreateImage.sci
@@ -17,7 +17,6 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels)
 //
 // Parameters
 //     image_size: width and height of image
-<<<<<<< HEAD
 //     bit_depth: Bit depth of image elements
 //     no_of_channels: no of channels per pixels
 //
@@ -36,27 +35,5 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels)
 //
 
 img = 0;
-=======
-//	   bit_depth: Bit depth of image elements
-//	   no_of_channels: no of channels per pixels
-//
-// Description
-//		This function can be used to create opencv image object. For more info
-//	    about bit depth and channels,please refer to OpenCV documentation 
-// Examples
-//		CV_CreateImage([320 240], "IPL_DEPTH_8U", 1)	//to create image of the size 320*240
-//		pixels with 8 bit unsigned each pixels and gray scale image  
-//
-// See also
-//     CV_LoadImage
-//
-//
-// Authors
-//     Siddhesh Wani
-//
-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/core/CV_GetImgSize.sci b/macros/ImageProcessing/core/CV_GetImgSize.sci
index 5ebbd7d..2b176da 100644
--- a/macros/ImageProcessing/core/CV_GetImgSize.sci
+++ b/macros/ImageProcessing/core/CV_GetImgSize.sci
@@ -15,16 +15,11 @@ function imgsize = CV_GetImgSize(img)
 //     CV_GetImgSize(img)
 //
 // Parameters
-<<<<<<< HEAD
 //     img: image whose size is to be returned
-=======
-//	   img: image whose size is to be returned
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //
 // Description
 //		This function can be used for retriving size information of the image.
 //		It returs an array with first image element as width and second as height
-<<<<<<< HEAD
 //
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for OpenCV
@@ -32,25 +27,13 @@ function imgsize = CV_GetImgSize(img)
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	size = CV_GetImgSize(img)
-=======
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		size = CV_GetImgSize(img)
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CreateImage
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 imgsize = [0 0];
-=======
-imgsize = [0 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_LoadImage.sci b/macros/ImageProcessing/highgui/CV_LoadImage.sci
index 48a77fa..c420c7a 100644
--- a/macros/ImageProcessing/highgui/CV_LoadImage.sci
+++ b/macros/ImageProcessing/highgui/CV_LoadImage.sci
@@ -16,7 +16,6 @@ function img = CV_LoadImage(filename,loadtype)
 //
 // Parameters
 //     filename: name of file to be opened
-<<<<<<< HEAD
 //     loadtype: desired load method
 //
 // Description
@@ -42,27 +41,5 @@ function img = CV_LoadImage(filename,loadtype)
 //
 
 img = 0;
-=======
-//	   loadtype: desired load method
-//			<0 --> image is loaded as is (with alpha channel)
-//			=0 --> image is loaded as greyscale
-//			>0 --> 3 channel color image is loaded
-//
-// Description
-//		This function can be used for loading a previously stored image
-// Examples
-//		CV_LoadImage('~/test.jpg',0)
-//
-// See also
-//     CV_CreateImage
-//
-//
-// Authors
-//     Siddhesh Wani
-//
-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 999c634..6c5b0bf 100644
--- a/macros/ImageProcessing/highgui/CV_SaveImage.sci
+++ b/macros/ImageProcessing/highgui/CV_SaveImage.sci
@@ -15,7 +15,6 @@ 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
 //
@@ -29,31 +28,13 @@ function status = CV_SaveImage(filename,img)
 // 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
-//
-// Description
-//		This function can be used for saving image. File format is detected
-//		from file extension 
-// Examples
-//		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 24621f3..2300d25 100644
--- a/macros/ImageProcessing/highgui/CV_ShowImage.sci
+++ b/macros/ImageProcessing/highgui/CV_ShowImage.sci
@@ -12,7 +12,6 @@ function CV_ShowImage(winname,img)
 // function to show an image 
 //
 // Calling Sequence
-<<<<<<< HEAD
 //     CV_ShowImage(img)
 //     CV_ShowImage(winname,img)
 //
@@ -32,33 +31,9 @@ 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
diff --git a/macros/ImageProcessing/highgui/CV_WaitKey.sci b/macros/ImageProcessing/highgui/CV_WaitKey.sci
index 858ca7a..46fd91f 100644
--- a/macros/ImageProcessing/highgui/CV_WaitKey.sci
+++ b/macros/ImageProcessing/highgui/CV_WaitKey.sci
@@ -15,7 +15,6 @@ function CV_WaitKey(delay)
 //     CV_WaitKey(delay)
 //
 // Parameters
-<<<<<<< HEAD
 //	delay: waiting delay, if 0 then wait till keypress
 //
 // Description
@@ -32,30 +31,9 @@ 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
diff --git a/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci b/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci
index ff6731a..e594f37 100644
--- a/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci
+++ b/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci
@@ -8,7 +8,6 @@
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
 
-<<<<<<< HEAD
 function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_type, block_size, C)
 // function to adaptively threshold input image
 //
@@ -29,30 +28,6 @@ function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_t
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for OpenCV
 //
-=======
-function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ...
-					thresh_type, block_size, C)
-// function to adaptively threshold input image
-//
-// Calling Sequence
-//     dst = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ...
-//				thresh_type,blk_size,c)
-//
-// Parameters
-//     	src -> Source 8-bit single-channel image.
-//		max_value -> Non-zero value assigned to the pixels for which the 
-//					condition is satisfied. See the details below.
-//		adaptive_method -> Adaptive thresholding algorithm to use, 
-//					ADAPTIVE_THRESH_MEAN_C or ADAPTIVE_THRESH_GAUSSIAN_C . 
-//		thresh_type -> Thresholding type that must be either THRESH_BINARY 
-//					or THRESH_BINARY_INV .
-//		blockSize -> Size of a pixel neighborhood that is used to calculate 
-//					a threshold value for the pixel: 3, 5, 7, and so on.
-//		C -> Constant subtracted from the mean or weighted mean.Normally, 
-//					it is positive but may be zero or negative as well.
-// Description
-//		This function can be used for adaptively threshold given image
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // Examples
 //		img = CV_LoadImage('~/test.jpg',0)
 //		dst = CV_AdaptiveThreshold(img,255,"ADAPTIVE_THRESH_MEAN_C", ...
@@ -64,13 +39,7 @@ function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ...
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_Blur.sci b/macros/ImageProcessing/imgproc/CV_Blur.sci
index 9a16396..784e4c9 100644
--- a/macros/ImageProcessing/imgproc/CV_Blur.sci
+++ b/macros/ImageProcessing/imgproc/CV_Blur.sci
@@ -8,7 +8,6 @@
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
 
-<<<<<<< HEAD
 function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,border_type)
 // function to blur image using normalised box filter
 //
@@ -37,30 +36,6 @@ function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,bord
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for OpenCV
 //
-=======
-function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ...
-							border_type)
-// function to blur image using normalised box filter
-//
-// Calling Sequence
-//     dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ...
-//				border_type)
-//
-// Parameters
-//     	srcimg -> Source image.
-//		ksize_width, ksize_height -> blurring kernel size.
-//		anchor_x, anchor_y -> x,y coordinates of anchor point
-//		borderType -> border mode used to extrapolate pixels outside of the 
-//				image. Can be :
-//						BORDER_REPLICATE:     	aaaaaa|abcdefgh|hhhhhhh
-//						BORDER_REFLECT:       	fedcba|abcdefgh|hgfedcb
-//						BORDER_REFLECT_101:   	gfedcb|abcdefgh|gfedcba
-//						BORDER_WRAP:          	cdefgh|abcdefgh|abcdefg
-//						BORDER_CONSTANT:		iiiiii|abcdefgh|iiiiiii  
-// Description
-//		This function can be used for blurring image using normalised box 
-//		filter. Image can be of any depth and have any no of channels. 
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // Examples
 //		img = CV_LoadImage('~/test.jpg',0)
 //		dst = CV_Blur(img,3,3,-1,-1,"BORDER_CONSTANT")
@@ -71,13 +46,7 @@ function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ...
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_Canny.sci b/macros/ImageProcessing/imgproc/CV_Canny.sci
index 1adb11e..be1c2cc 100644
--- a/macros/ImageProcessing/imgproc/CV_Canny.sci
+++ b/macros/ImageProcessing/imgproc/CV_Canny.sci
@@ -15,7 +15,6 @@ function edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient)
 //     edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient)
 //
 // Parameters
-<<<<<<< HEAD
 //	srcimg : single-channel 8-bit input image.
 //	threshold1 : first threshold for the hysteresis procedure.
 //	threshold2 : second threshold for the hysteresis procedure.
@@ -36,40 +35,13 @@ function edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient)
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_CvtColor(img,"CV_RGB2GRAY");
 //	edge = CV_Canny(dst,50,100,3,0);
-=======
-//		srcimg -> single-channel 8-bit input image.
-//		threshold1 -> first threshold for the hysteresis procedure.
-//		threshold2 -> second threshold for the hysteresis procedure.
-//		aperture_size -> aperture size for the Sobel() operator.
-//		L2gradient -> a flag, indicating whether a more accurate  
-//				L_2 norm  =sqrt{(dI/dx)^2 + (dI/dy)^2} should be used to 
-//				calculate the image gradient magnitude ( L2gradient=1 ),
-//				or whether the default  L_1 norm  =|dI/dx|+|dI/dy| is enough
-//				( L2gradient=0).
-// Description
-//		This function can be used for finding edes in single channel 8 bit 
-//		image. 'aperture_size' and 'L2gradient' are optionals. By default,
-//		aperture_size is 3 and L2gradient is false.
-// 
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_CvtColor(img,"CV_RGB2GRAY");
-//		edge = CV_Canny(dst,50,100,3,0);
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CvtColor
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 edges = 0
-=======
-edges = 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/imgproc/CV_CornerHarris.sci b/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
index 741dc2b..ccb83cb 100644
--- a/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
+++ b/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
@@ -12,7 +12,6 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
 //Finds edges in image using Harris algorithm
 //
 // Calling Sequence
-<<<<<<< HEAD
 //	edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
 //
 // Parameters
@@ -41,49 +40,13 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_CvtColor(img,"CV_RGB2GRAY");
 //	edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE");
-=======
-//		edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
-//
-// Parameters
-//		srcimg -> Input single-channel 8-bit or floating-point image.
-//		blockSize -> Neighborhood size 
-//		ksize -> Aperture parameter for the Sobel() operator.
-//		k -> Harris detector free parameter. 
-//		borderType -> border mode used to extrapolate pixels outside of the 
-//				image. It can be :
-//						BORDER_REPLICATE:     	aaaaaa|abcdefgh|hhhhhhh
-//						BORDER_REFLECT:       	fedcba|abcdefgh|hgfedcb
-//						BORDER_REFLECT_101:   	gfedcb|abcdefgh|gfedcba
-//						BORDER_WRAP:          	cdefgh|abcdefgh|abcdefg
-//						BORDER_CONSTANT:		iiiiii|abcdefgh|iiiiiii  
-// Description
-// 		The function runs the Harris edge detector on the image. For each 
-//		pixel (x, y) it calculates a 2 * 2 gradient covariance matrix M(x,y)
-//		over a blockSize * blockSize neighborhood. Then, it computes the 
-//		following characteristic:
-//		dst(x,y) =  det(M(x,y)) - k .tr(M(x,y))^2
-//		Corners in the image can be found as the local maxima of this 
-//		response map
-//
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_CvtColor(img,"CV_RGB2GRAY");
-//		edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE");
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     	CV_LoadImage CV_CvtColor
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 edges = 0
-=======
-edges = 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/imgproc/CV_CvtColor.sci b/macros/ImageProcessing/imgproc/CV_CvtColor.sci
index 3252c12..dcf756c 100644
--- a/macros/ImageProcessing/imgproc/CV_CvtColor.sci
+++ b/macros/ImageProcessing/imgproc/CV_CvtColor.sci
@@ -15,7 +15,6 @@ function cvtimg = CV_CvtColor(srcimg,code)
 //     CV_CvtColor(srcimg,code)
 //
 // Parameters
-<<<<<<< HEAD
 //	srcimg: source image to be converted
 //	dstimg: destination image in which to store converted image
 //	code: String specifying conversion type. Same as defined in OpenCV. for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image
@@ -31,34 +30,13 @@ function cvtimg = CV_CvtColor(srcimg,code)
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_CvtColor(img,'CV_RGB2GRAY')
-=======
-//     srcimg: source image to be converted
-//	   dstimg: destination image in which to store converted image
-//	   code: String specifying conversion type. Same as defined in OpenCV
-//			for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image
-//	   dstCn: no of channels in destination image (0 by default)
-//
-// Description
-//		This function can be used for converting an image to other colorspace.
-//		Refer OpenCV documentation for list of available conversions
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_CvtColor(img,'CV_RGB2GRAY')
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CreateImage
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_Dilate.sci b/macros/ImageProcessing/imgproc/CV_Dilate.sci
index 124ec89..25e2c84 100644
--- a/macros/ImageProcessing/imgproc/CV_Dilate.sci
+++ b/macros/ImageProcessing/imgproc/CV_Dilate.sci
@@ -8,7 +8,6 @@
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
 
-<<<<<<< HEAD
 function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations,border_type,border_value)
 // dilates an image by using a specific structuring element.
 //
@@ -40,52 +39,13 @@ function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations,border
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0);
-=======
-function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations, ...
-					border_type,border_value)
-// dilates an image by using a specific structuring element.
-//
-// Calling Sequence
-//     cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,[iterations, ...
-//					border_type,border_value])
-// Parameters
-//     	src -> input image; the number of channels can be arbitrary, but the 
-//				depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-//		dilation_type -> can be one of :	MORPH_RECT, MORPH_CROSS, 
-//							MORPH_ELLIPSE	
-//		dilation_size -> size of kernel to be used for erosion. Must be odd
-//		iterations -> number of times erosion is applied.
-//		border_type -> pixel extrapolation method. It can be:
-//						BORDER_REPLICATE:     	aaaaaa|abcdefgh|hhhhhhh
-//						BORDER_REFLECT:       	fedcba|abcdefgh|hgfedcb
-//						BORDER_REFLECT_101:   	gfedcb|abcdefgh|gfedcba
-//						BORDER_WRAP:          	cdefgh|abcdefgh|abcdefg
-//						BORDER_CONSTANT:		iiiiii|abcdefgh|iiiiiii  
-//		border_value -> border value in case of a constant border 
-// Description
-//		This function can be used for eroding an image. Kernel used for erosion
-//		is decided by type and size. Size must always be odd. Anchor pint of
-//		kernel is always center of kernel. Input arguements 'iterations(1),
-//		border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not
-//		specified, default values as as mentioned in brackets. 
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0);
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_Erode
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_DistanceTransform.sci b/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci
index 811d8f4..1f304a6 100644
--- a/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci
+++ b/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci
@@ -15,7 +15,6 @@ function dstimg = CV_DistanceTransform(srcimg,distance_type,mask_size)
 //     dst = CV_DistanceTransform(srcimg,distance_type,mask_size)
 //
 // Parameters
-<<<<<<< HEAD
 //     	srcimg : Source 8-bit single-channel image.
 //	distance_type : Type of distance. It can be CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C
 //	mask_size : Size of the distance transform mask
@@ -29,33 +28,13 @@ function dstimg = CV_DistanceTransform(srcimg,distance_type,mask_size)
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_DistanceTransform(img,"CV_DIST_L1",3)
-=======
-//     	srcimg -> Source 8-bit single-channel image.
-//		distance_type -> Type of distance. It can be 
-//							CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C
-//		mask_size -> Size of the distance transform mask
-// Description
-//		This function can be used to calculate distance to closest zero 
-//		pixel for each pixel of the source image. Output is 32 bit floating
-//		point, single channel image of the same size as that of source image.
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_DistanceTransform(img,"CV_DIST_L1",3)
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CreateImage CV_CvtColor
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 dstimg = 0
-=======
-dstimg = 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/imgproc/CV_Erode.sci b/macros/ImageProcessing/imgproc/CV_Erode.sci
index 8ae8ca5..73f3ee5 100644
--- a/macros/ImageProcessing/imgproc/CV_Erode.sci
+++ b/macros/ImageProcessing/imgproc/CV_Erode.sci
@@ -8,7 +8,6 @@
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
 
-<<<<<<< HEAD
 function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations,border_type,border_value)
 // Erodes an image by using a specific structuring element.
 //
@@ -40,51 +39,13 @@ function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations,border_ty
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0);
-=======
-function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations, ...
-					border_type,border_value)
-// Erodes an image by using a specific structuring element.
-//
-// Calling Sequence
-//     cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,[iterations, ...
-//					border_type,border_value])
-// Parameters
-//     	src -> input image; the number of channels can be arbitrary, but the 
-//				depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-//		erosion_type -> can be one of :	MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE	
-//		erosion_size -> size of kernel to be used for erosion. Must be odd
-//		iterations -> number of times erosion is applied.
-//		border_type -> pixel extrapolation method. It can be:
-//						BORDER_REPLICATE:     	aaaaaa|abcdefgh|hhhhhhh
-//						BORDER_REFLECT:       	fedcba|abcdefgh|hgfedcb
-//						BORDER_REFLECT_101:   	gfedcb|abcdefgh|gfedcba
-//						BORDER_WRAP:          	cdefgh|abcdefgh|abcdefg
-//						BORDER_CONSTANT:		iiiiii|abcdefgh|iiiiiii  
-//		border_value -> border value in case of a constant border 
-// Description
-//		This function can be used for eroding an image. Kernel used for erosion
-//		is decided by type and size. Size must always be odd. Anchor pint of
-//		kernel is always center of kernel. Input arguements 'iterations(1),
-//		border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not
-//		specified, default values as as mentioned in brackets. 
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0);
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_Dilate
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_GaussianBlur.sci b/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
index 99ba008..814355e 100644
--- a/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
+++ b/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
@@ -8,7 +8,6 @@
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
 
-<<<<<<< HEAD
 function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y,border_type)
 // function to blur image using gaussian filter
 //
@@ -42,51 +41,13 @@ function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT")
-=======
-function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y, ...
-							border_type)
-// function to blur image using gaussian filter
-//
-// Calling Sequence
-//     dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ...
-//				border_type)
-//
-// Parameters
-//     	srcimg -> Source image.
-//		ksize_width, ksize_height -> blurring kernel size. must be odd.
-//		sigmaX -> Gaussian kernel standard deviation in X direction.
-//		sigmaY -> Gaussian kernel standard deviation in Y direction; 
-//					if sigmaY is zero, it is set to be equal to sigmaX, 
-//					if both sigmas are zeros, they are computed from 
-//					ksize.width and ksize.height , respectively 
-//		borderType -> border mode used to extrapolate pixels outside of the 
-//				image. Can be :
-//						BORDER_REPLICATE:     	aaaaaa|abcdefgh|hhhhhhh
-//						BORDER_REFLECT:       	fedcba|abcdefgh|hgfedcb
-//						BORDER_REFLECT_101:   	gfedcb|abcdefgh|gfedcba
-//						BORDER_WRAP:          	cdefgh|abcdefgh|abcdefg
-//						BORDER_CONSTANT:		iiiiii|abcdefgh|iiiiiii  
-// Description
-//		This function can be used for blurring image using gaussian 
-//		filter. Image can be of any depth and have any no of channels. 
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT")
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_Blur, CV_CvtColor
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_MedianBlur.sci b/macros/ImageProcessing/imgproc/CV_MedianBlur.sci
index eb20f53..5f6069a 100644
--- a/macros/ImageProcessing/imgproc/CV_MedianBlur.sci
+++ b/macros/ImageProcessing/imgproc/CV_MedianBlur.sci
@@ -12,7 +12,6 @@ function cvtimg = CV_MedianBlur(srcimg,ksize)
 // function to blur image using median filter
 //
 // Calling Sequence
-<<<<<<< HEAD
 //     cvtimg = CV_MedianBlur(srcimg,ksize)
 //
 // Parameters
@@ -31,37 +30,11 @@ function cvtimg = CV_MedianBlur(srcimg,ksize)
 //	dst = CV_MedianBlur(img,3)
 // See also
 //     CV_GaussianBlur, CV_Blur, CV_CvtColor
-=======
-//     dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ...
-//				border_type)
-//
-// Parameters
-//     	srcimg -> input 1-, 3-, or 4-channel image; when ksize is 3 or 5, 
-//				the image depth should be CV_8U, CV_16U, or CV_32F, for 
-//				larger aperture sizes, it can only be CV_8U.
-//		ksize_width -> aperture linear size; it must be odd and greater than 1,
-//				for example: 3, 5, 7 ...
-// Description
-//		This function can be used for blurring image using median 
-//		filter. Image can be of any depth and have any no of channels. 
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_MedianBlur(img,3)
-//
-// See also
-//     CV_GaussianBlur CV_Blur, CV_CvtColor
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 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/imgproc/CV_Threshold.sci b/macros/ImageProcessing/imgproc/CV_Threshold.sci
index 2364e2e..0563c36 100644
--- a/macros/ImageProcessing/imgproc/CV_Threshold.sci
+++ b/macros/ImageProcessing/imgproc/CV_Threshold.sci
@@ -16,7 +16,6 @@ function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type)
 //
 // Parameters
 //     	srcimg: source image to be converted
-<<<<<<< HEAD
 //	threshold: threshold value
 //	max_value: maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV
 //	thresh_type: Type for threshold. It can one of the following: THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, THRESH_TOZERO, THRESH_TOZERO_INV
@@ -31,33 +30,13 @@ function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type)
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	dst = CV_Threshold(img,100,255,'THRESH_BINARY')
-=======
-//	   	threshold: threshold value
-//		max_value: maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV
-//		thresh_type: Type for threshold. It can one of the following:
-//					THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC,
-//					THRESH_TOZERO, THRESH_TOZERO_INV
-// Description
-//		This function can be used for converting an image to other colorspace.
-//		Refer OpenCV documentation for list of available conversions
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		dst = CV_Threshold(img,100,255,'THRESH_BINARY')
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CreateImage
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 cvtimg = 0
-=======
-cvtimg = 0
-// This is curretly dummy function. It provides no functionality but is required 
-// for providing support for generating C code for OpenCV
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction