define adaptiveMethod and thresholdType for HAL

elenagvo · elenagvo · commit 762138e77e25 · 2017-11-28T16:02:06.000+03:00
diff --git a/modules/imgproc/include/opencv2/imgproc/hal/interface.h b/modules/imgproc/include/opencv2/imgproc/hal/interface.h
@@ -21,6 +21,26 @@
 #define CV_HAL_MORPH_DILATE 1
 //! @}
 
+//! @name Threshold types
+//! @sa cv::ThresholdTypes
+//! @{
+#define CV_HAL_THRESH_BINARY      0
+#define CV_HAL_THRESH_BINARY_INV  1
+#define CV_HAL_THRESH_TRUNC       2
+#define CV_HAL_THRESH_TOZERO      3
+#define CV_HAL_THRESH_TOZERO_INV  4
+#define CV_HAL_THRESH_MASK        7
+#define CV_HAL_THRESH_OTSU        8
+#define CV_HAL_THRESH_TRIANGLE    16
+//! @}
+
+//! @name Adaptive threshold algorithm
+//! @sa cv::AdaptiveThresholdTypes
+//! @{
+#define CV_HAL_ADAPTIVE_THRESH_MEAN_C     0
+#define CV_HAL_ADAPTIVE_THRESH_GAUSSIAN_C 1
+//! @}
+
 //! @}
 
 #endif
diff --git a/modules/imgproc/src/thresh.cpp b/modules/imgproc/src/thresh.cpp
@@ -1549,7 +1549,7 @@ void cv::adaptiveThreshold( InputArray _src, OutputArray _dst, double maxValue,
         Mat srcfloat,meanfloat;
         src.convertTo(srcfloat,CV_32F);
         meanfloat=srcfloat;
-        GaussianBlur(srcfloat, meanfloat, Size(blockSize, blockSize), 0, 0, BORDER_REPLICATE);
+        GaussianBlur(srcfloat, meanfloat, Size(blockSize, blockSize), 0, 0, BORDER_REPLICATE|BORDER_ISOLATED);
         meanfloat.convertTo(mean, src.type());
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -1549,7 +1549,7 @@ void cv::adaptiveThreshold( InputArray _src, OutputArray _dst, double maxValue,`
`1549`	`1549`	`Mat srcfloat,meanfloat;`
`1550`	`1550`	`src.convertTo(srcfloat,CV_32F);`
`1551`	`1551`	`meanfloat=srcfloat;`
`1552`		`- GaussianBlur(srcfloat, meanfloat, Size(blockSize, blockSize), 0, 0, BORDER_REPLICATE);`
	`1552`	`+ GaussianBlur(srcfloat, meanfloat, Size(blockSize, blockSize), 0, 0, BORDER_REPLICATE\|BORDER_ISOLATED);`
`1553`	`1553`	`meanfloat.convertTo(mean, src.type());`
`1554`	`1554`	`}`
`1555`	`1555`	`else`