summaryrefslogtreecommitdiff
path: root/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commit39874e472e540ca1bb923b97b52900e1d60439cc (patch)
treee0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
parent3adebb16388c6712f7d9c268b91849d164e696df (diff)
downloadScilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.gz
Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.bz2
Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci')
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci39
1 files changed, 0 insertions, 39 deletions
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
index 99ba008a..814355e0 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci
+++ b/2.3-1/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