summaryrefslogtreecommitdiff
path: root/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci')
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci31
1 files changed, 0 insertions, 31 deletions
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci
index ff6731a4..e594f372 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci
+++ b/2.3-1/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