summaryrefslogtreecommitdiff
path: root/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/ImageProcessing/imgproc/CV_CornerHarris.sci')
-rw-r--r--macros/ImageProcessing/imgproc/CV_CornerHarris.sci37
1 files changed, 0 insertions, 37 deletions
diff --git a/macros/ImageProcessing/imgproc/CV_CornerHarris.sci b/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
index 741dc2ba..ccb83cb7 100644
--- a/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
+++ b/macros/ImageProcessing/imgproc/CV_CornerHarris.sci
@@ -12,7 +12,6 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
//Finds edges in image using Harris algorithm
//
// Calling Sequence
-<<<<<<< HEAD
// edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
//
// Parameters
@@ -41,49 +40,13 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
// img = CV_LoadImage('~/test.jpg',0)
// dst = CV_CvtColor(img,"CV_RGB2GRAY");
// edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE");
-=======
-// edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type)
-//
-// Parameters
-// srcimg -> Input single-channel 8-bit or floating-point image.
-// blockSize -> Neighborhood size
-// ksize -> Aperture parameter for the Sobel() operator.
-// k -> Harris detector free parameter.
-// borderType -> border mode used to extrapolate pixels outside of the
-// image. 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
-// Description
-// The function runs the Harris edge detector on the image. For each
-// pixel (x, y) it calculates a 2 * 2 gradient covariance matrix M(x,y)
-// over a blockSize * blockSize neighborhood. Then, it computes the
-// following characteristic:
-// dst(x,y) = det(M(x,y)) - k .tr(M(x,y))^2
-// Corners in the image can be found as the local maxima of this
-// response map
-//
-// Examples
-// img = CV_LoadImage('~/test.jpg',0)
-// dst = CV_CvtColor(img,"CV_RGB2GRAY");
-// edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE");
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// See also
// CV_LoadImage CV_CvtColor
//
// Authors
// Siddhesh Wani
//
-<<<<<<< HEAD
edges = 0
-=======
-edges = 0
-// This is curretly dummy function. It provides no functionality but is required
-// for providing support for generating C code for OpenCV
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
endfunction