summaryrefslogtreecommitdiff
path: root/macros/ImageProcessing/imgproc/CV_MedianBlur.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/ImageProcessing/imgproc/CV_MedianBlur.sci')
-rw-r--r--macros/ImageProcessing/imgproc/CV_MedianBlur.sci27
1 files changed, 0 insertions, 27 deletions
diff --git a/macros/ImageProcessing/imgproc/CV_MedianBlur.sci b/macros/ImageProcessing/imgproc/CV_MedianBlur.sci
index eb20f53f..5f6069a7 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