summaryrefslogtreecommitdiff
path: root/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci')
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci21
1 files changed, 21 insertions, 0 deletions
diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci
index 0563c360..2364e2e5 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci
+++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci
@@ -16,6 +16,7 @@ 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
@@ -30,13 +31,33 @@ 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