generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

accept multiple channels image for threshold on cuda

Browse Source 
* modify test, too
This commit is contained in:
Tomoaki Teshima 2016-05-16 06:45:35 +09:00
parent d6b8563530
commit b6a093fba1
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cudaarithm/src/cuda/threshold.cu
View File

@ -101,10 +101,12 @@ double cv::cuda::threshold(InputArray _src, OutputArray _dst, double thresh, dou
const int depth = src.depth(); const int depth = src.depth();
CV_Assert( src.channels() == 1 && depth <= CV_64F ); CV_Assert( depth <= CV_64F );
CV_Assert( type <= 4 /*THRESH_TOZERO_INV*/ ); CV_Assert( type <= 4 /*THRESH_TOZERO_INV*/ );
GpuMat dst = getOutputMat(_dst, src.size(), src.type(), stream); GpuMat dst = getOutputMat(_dst, src.size(), src.type(), stream);
src = src.reshape(1);
dst = dst.reshape(1);
if (depth == CV_32F && type == 2 /*THRESH_TRUNC*/) if (depth == CV_32F && type == 2 /*THRESH_TRUNC*/)
{ {

13
modules/cudaarithm/test/test_element_operations.cpp
View File

@ -2532,11 +2532,12 @@ INSTANTIATE_TEST_CASE_P(CUDA_Arithm, AddWeighted, testing::Combine(
CV_ENUM(ThreshOp, cv::THRESH_BINARY, cv::THRESH_BINARY_INV, cv::THRESH_TRUNC, cv::THRESH_TOZERO, cv::THRESH_TOZERO_INV) CV_ENUM(ThreshOp, cv::THRESH_BINARY, cv::THRESH_BINARY_INV, cv::THRESH_TRUNC, cv::THRESH_TOZERO, cv::THRESH_TOZERO_INV)
#define ALL_THRESH_OPS testing::Values(ThreshOp(cv::THRESH_BINARY), ThreshOp(cv::THRESH_BINARY_INV), ThreshOp(cv::THRESH_TRUNC), ThreshOp(cv::THRESH_TOZERO), ThreshOp(cv::THRESH_TOZERO_INV)) #define ALL_THRESH_OPS testing::Values(ThreshOp(cv::THRESH_BINARY), ThreshOp(cv::THRESH_BINARY_INV), ThreshOp(cv::THRESH_TRUNC), ThreshOp(cv::THRESH_TOZERO), ThreshOp(cv::THRESH_TOZERO_INV))
PARAM_TEST_CASE(Threshold, cv::cuda::DeviceInfo, cv::Size, MatType, ThreshOp, UseRoi) PARAM_TEST_CASE(Threshold, cv::cuda::DeviceInfo, cv::Size, MatType, Channels, ThreshOp, UseRoi)
{ {
cv::cuda::DeviceInfo devInfo; cv::cuda::DeviceInfo devInfo;
cv::Size size; cv::Size size;
int type; int type;
int channel;
int threshOp; int threshOp;
bool useRoi; bool useRoi;
@ -2545,8 +2546,9 @@ PARAM_TEST_CASE(Threshold, cv::cuda::DeviceInfo, cv::Size, MatType, ThreshOp, Us
devInfo = GET_PARAM(0); devInfo = GET_PARAM(0);
size = GET_PARAM(1); size = GET_PARAM(1);
type = GET_PARAM(2); type = GET_PARAM(2);
threshOp = GET_PARAM(3); channel = GET_PARAM(3);
useRoi = GET_PARAM(4); threshOp = GET_PARAM(4);
useRoi = GET_PARAM(5);
cv::cuda::setDevice(devInfo.deviceID()); cv::cuda::setDevice(devInfo.deviceID());
} }
@ -2554,7 +2556,7 @@ PARAM_TEST_CASE(Threshold, cv::cuda::DeviceInfo, cv::Size, MatType, ThreshOp, Us
CUDA_TEST_P(Threshold, Accuracy) CUDA_TEST_P(Threshold, Accuracy)
{ {
cv::Mat src = randomMat(size, type); cv::Mat src = randomMat(size, CV_MAKE_TYPE(type, channel));
double maxVal = randomDouble(20.0, 127.0); double maxVal = randomDouble(20.0, 127.0);
double thresh = randomDouble(0.0, maxVal); double thresh = randomDouble(0.0, maxVal);
@ -2570,7 +2572,8 @@ CUDA_TEST_P(Threshold, Accuracy)
INSTANTIATE_TEST_CASE_P(CUDA_Arithm, Threshold, testing::Combine( INSTANTIATE_TEST_CASE_P(CUDA_Arithm, Threshold, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
DIFFERENT_SIZES, DIFFERENT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_16SC1), MatType(CV_32FC1)), testing::Values(MatDepth(CV_8U), MatDepth(CV_16S), MatDepth(CV_32F)),
ALL_CHANNELS,
ALL_THRESH_OPS, ALL_THRESH_OPS,
WHOLE_SUBMAT)); WHOLE_SUBMAT));