From 3d0410c147b011ab9dfc67fe6b34763d74e4135e Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Wed, 24 Dec 2014 13:35:23 +0300
Subject: [PATCH] remove reciprocal version of cuda::divide
it might cause errors, due to implicit type conversion and another cuda::divide
overload
---
modules/cudaarithm/include/opencv2/cudaarithm.hpp | 6 ------
modules/cudaarithm/test/test_element_operations.cpp | 4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/modules/cudaarithm/include/opencv2/cudaarithm.hpp b/modules/cudaarithm/include/opencv2/cudaarithm.hpp
index 98ebfbef88..be095b92e1 100644
--- a/modules/cudaarithm/include/opencv2/cudaarithm.hpp
+++ b/modules/cudaarithm/include/opencv2/cudaarithm.hpp
@@ -130,12 +130,6 @@ This function, in contrast to divide, uses a round-down rounding mode.
*/
CV_EXPORTS void divide(InputArray src1, InputArray src2, OutputArray dst, double scale = 1, int dtype = -1, Stream& stream = Stream::Null());
-//! computes element-wise weighted reciprocal of an array (dst = scale/src2)
-static inline void divide(double src1, InputArray src2, OutputArray dst, int dtype = -1, Stream& stream = Stream::Null())
-{
- divide(src1, src2, dst, 1.0, dtype, stream);
-}
-
/** @brief Computes per-element absolute difference of two matrices (or of a matrix and scalar).
@param src1 First source matrix or scalar.
diff --git a/modules/cudaarithm/test/test_element_operations.cpp b/modules/cudaarithm/test/test_element_operations.cpp
index 4a43d9d306..a4a16ea89f 100644
--- a/modules/cudaarithm/test/test_element_operations.cpp
+++ b/modules/cudaarithm/test/test_element_operations.cpp
@@ -1329,7 +1329,7 @@ CUDA_TEST_P(Divide_Scalar_First, Accuracy)
try
{
cv::cuda::GpuMat dst;
- cv::cuda::divide(scale, loadMat(mat), dst, depth.second);
+ cv::cuda::divide(scale, loadMat(mat), dst, 1.0, depth.second);
}
catch (const cv::Exception& e)
{
@@ -1339,7 +1339,7 @@ CUDA_TEST_P(Divide_Scalar_First, Accuracy)
else
{
cv::cuda::GpuMat dst = createMat(size, depth.second, useRoi);
- cv::cuda::divide(scale, loadMat(mat, useRoi), dst, depth.second);
+ cv::cuda::divide(scale, loadMat(mat, useRoi), dst, 1.0, depth.second);
cv::Mat dst_gold;
cv::divide(scale, mat, dst_gold, depth.second);