diff --git a/modules/cudaarithm/src/cuda/absdiff_mat.cu b/modules/cudaarithm/src/cuda/absdiff_mat.cu index 0f93b00eb..ec04f1228 100644 --- a/modules/cudaarithm/src/cuda/absdiff_mat.cu +++ b/modules/cudaarithm/src/cuda/absdiff_mat.cu @@ -148,7 +148,7 @@ void absDiffMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMa const int depth = src1.depth(); - CV_DbgAssert( depth < 7 ); + CV_DbgAssert( depth <= CV_64F ); GpuMat src1_ = src1.reshape(1); GpuMat src2_ = src2.reshape(1); diff --git a/modules/cudaarithm/src/cuda/absdiff_scalar.cu b/modules/cudaarithm/src/cuda/absdiff_scalar.cu index f6cebdac7..3ffd0661b 100644 --- a/modules/cudaarithm/src/cuda/absdiff_scalar.cu +++ b/modules/cudaarithm/src/cuda/absdiff_scalar.cu @@ -102,7 +102,7 @@ void absDiffScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const G const int depth = src.depth(); - CV_DbgAssert( depth < 7 ); + CV_DbgAssert( depth <= CV_64F ); funcs[depth](src, val[0], dst, stream); } diff --git a/modules/cudaarithm/src/cuda/add_mat.cu b/modules/cudaarithm/src/cuda/add_mat.cu index 6e7a7925f..4166cc104 100644 --- a/modules/cudaarithm/src/cuda/add_mat.cu +++ b/modules/cudaarithm/src/cuda/add_mat.cu @@ -185,7 +185,7 @@ void addMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat& m const int sdepth = src1.depth(); const int ddepth = dst.depth(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F ); GpuMat src1_ = src1.reshape(1); GpuMat src2_ = src2.reshape(1); diff --git a/modules/cudaarithm/src/cuda/add_scalar.cu b/modules/cudaarithm/src/cuda/add_scalar.cu index e0788e9bd..92838a2a5 100644 --- a/modules/cudaarithm/src/cuda/add_scalar.cu +++ b/modules/cudaarithm/src/cuda/add_scalar.cu @@ -167,7 +167,7 @@ void addScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const GpuMa const int ddepth = dst.depth(); const int cn = src.channels(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 && cn <= 4 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F && cn <= 4 ); const func_t func = funcs[sdepth][ddepth][cn - 1]; diff --git a/modules/cudaarithm/src/cuda/div_mat.cu b/modules/cudaarithm/src/cuda/div_mat.cu index e139cb4ae..2a2fb9bf5 100644 --- a/modules/cudaarithm/src/cuda/div_mat.cu +++ b/modules/cudaarithm/src/cuda/div_mat.cu @@ -190,7 +190,7 @@ void divMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat&, const int sdepth = src1.depth(); const int ddepth = dst.depth(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F ); GpuMat src1_ = src1.reshape(1); GpuMat src2_ = src2.reshape(1); diff --git a/modules/cudaarithm/src/cuda/div_scalar.cu b/modules/cudaarithm/src/cuda/div_scalar.cu index 186e1766e..d3d2ce03f 100644 --- a/modules/cudaarithm/src/cuda/div_scalar.cu +++ b/modules/cudaarithm/src/cuda/div_scalar.cu @@ -236,7 +236,7 @@ void divScalar(const GpuMat& src, cv::Scalar val, bool inv, GpuMat& dst, const G const int ddepth = dst.depth(); const int cn = src.channels(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 && cn <= 4 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F && cn <= 4 ); if (inv) { diff --git a/modules/cudaarithm/src/cuda/mul_mat.cu b/modules/cudaarithm/src/cuda/mul_mat.cu index f45e4e209..6ea706557 100644 --- a/modules/cudaarithm/src/cuda/mul_mat.cu +++ b/modules/cudaarithm/src/cuda/mul_mat.cu @@ -176,7 +176,7 @@ void mulMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat&, const int sdepth = src1.depth(); const int ddepth = dst.depth(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F ); GpuMat src1_ = src1.reshape(1); GpuMat src2_ = src2.reshape(1); diff --git a/modules/cudaarithm/src/cuda/mul_scalar.cu b/modules/cudaarithm/src/cuda/mul_scalar.cu index 4700d3015..f27ef26dd 100644 --- a/modules/cudaarithm/src/cuda/mul_scalar.cu +++ b/modules/cudaarithm/src/cuda/mul_scalar.cu @@ -164,7 +164,7 @@ void mulScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const GpuMa const int ddepth = dst.depth(); const int cn = src.channels(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 && cn <= 4 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F && cn <= 4 ); val[0] *= scale; val[1] *= scale; diff --git a/modules/cudaarithm/src/cuda/sub_mat.cu b/modules/cudaarithm/src/cuda/sub_mat.cu index ec8d22922..6468692ae 100644 --- a/modules/cudaarithm/src/cuda/sub_mat.cu +++ b/modules/cudaarithm/src/cuda/sub_mat.cu @@ -185,7 +185,7 @@ void subMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat& m const int sdepth = src1.depth(); const int ddepth = dst.depth(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F ); GpuMat src1_ = src1.reshape(1); GpuMat src2_ = src2.reshape(1); diff --git a/modules/cudaarithm/src/cuda/sub_scalar.cu b/modules/cudaarithm/src/cuda/sub_scalar.cu index 35cea8cbe..c4eeec014 100644 --- a/modules/cudaarithm/src/cuda/sub_scalar.cu +++ b/modules/cudaarithm/src/cuda/sub_scalar.cu @@ -190,7 +190,7 @@ void subScalar(const GpuMat& src, cv::Scalar val, bool inv, GpuMat& dst, const G const int ddepth = dst.depth(); const int cn = src.channels(); - CV_DbgAssert( sdepth < 7 && ddepth < 7 && cn <= 4 ); + CV_DbgAssert( sdepth <= CV_64F && ddepth <= CV_64F && cn <= 4 ); const func_t func = funcs[sdepth][ddepth][cn - 1];