Commit 43e81111 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

fixed assertion

parent 766d950f
...@@ -148,7 +148,7 @@ void absDiffMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMa ...@@ -148,7 +148,7 @@ void absDiffMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMa
const int depth = src1.depth(); const int depth = src1.depth();
CV_DbgAssert( depth < 7 ); CV_DbgAssert( depth <= CV_64F );
GpuMat src1_ = src1.reshape(1); GpuMat src1_ = src1.reshape(1);
GpuMat src2_ = src2.reshape(1); GpuMat src2_ = src2.reshape(1);
......
...@@ -102,7 +102,7 @@ void absDiffScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const G ...@@ -102,7 +102,7 @@ void absDiffScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const G
const int depth = src.depth(); const int depth = src.depth();
CV_DbgAssert( depth < 7 ); CV_DbgAssert( depth <= CV_64F );
funcs[depth](src, val[0], dst, stream); funcs[depth](src, val[0], dst, stream);
} }
......
...@@ -185,7 +185,7 @@ void addMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat& m ...@@ -185,7 +185,7 @@ void addMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat& m
const int sdepth = src1.depth(); const int sdepth = src1.depth();
const int ddepth = dst.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 src1_ = src1.reshape(1);
GpuMat src2_ = src2.reshape(1); GpuMat src2_ = src2.reshape(1);
......
...@@ -167,7 +167,7 @@ void addScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const GpuMa ...@@ -167,7 +167,7 @@ void addScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const GpuMa
const int ddepth = dst.depth(); const int ddepth = dst.depth();
const int cn = src.channels(); 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]; const func_t func = funcs[sdepth][ddepth][cn - 1];
......
...@@ -190,7 +190,7 @@ void divMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat&, ...@@ -190,7 +190,7 @@ void divMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat&,
const int sdepth = src1.depth(); const int sdepth = src1.depth();
const int ddepth = dst.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 src1_ = src1.reshape(1);
GpuMat src2_ = src2.reshape(1); GpuMat src2_ = src2.reshape(1);
......
...@@ -236,7 +236,7 @@ void divScalar(const GpuMat& src, cv::Scalar val, bool inv, GpuMat& dst, const G ...@@ -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 ddepth = dst.depth();
const int cn = src.channels(); 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) if (inv)
{ {
......
...@@ -176,7 +176,7 @@ void mulMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat&, ...@@ -176,7 +176,7 @@ void mulMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat&,
const int sdepth = src1.depth(); const int sdepth = src1.depth();
const int ddepth = dst.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 src1_ = src1.reshape(1);
GpuMat src2_ = src2.reshape(1); GpuMat src2_ = src2.reshape(1);
......
...@@ -164,7 +164,7 @@ void mulScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const GpuMa ...@@ -164,7 +164,7 @@ void mulScalar(const GpuMat& src, cv::Scalar val, bool, GpuMat& dst, const GpuMa
const int ddepth = dst.depth(); const int ddepth = dst.depth();
const int cn = src.channels(); 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[0] *= scale;
val[1] *= scale; val[1] *= scale;
......
...@@ -185,7 +185,7 @@ void subMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat& m ...@@ -185,7 +185,7 @@ void subMat(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, const GpuMat& m
const int sdepth = src1.depth(); const int sdepth = src1.depth();
const int ddepth = dst.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 src1_ = src1.reshape(1);
GpuMat src2_ = src2.reshape(1); GpuMat src2_ = src2.reshape(1);
......
...@@ -190,7 +190,7 @@ void subScalar(const GpuMat& src, cv::Scalar val, bool inv, GpuMat& dst, const G ...@@ -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 ddepth = dst.depth();
const int cn = src.channels(); 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]; const func_t func = funcs[sdepth][ddepth][cn - 1];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment