summaryrefslogtreecommitdiff
path: root/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.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_Dilate.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_Dilate.sci')
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci40
1 files changed, 0 insertions, 40 deletions
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci
index 124ec897..25e2c844 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci
+++ b/2.3-1/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