Skip to content

O
opencv
Commit cb2985c5 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed gpu bitwize operation: 

incorrect types for template instantiation
parent adc1dd27
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
modules/gpu/src/element_operations.cpp
View file @ cb2985c5
...@@ -1993,7 +1993,7 @@ void cv::gpu::bitwise_not(const GpuMat& src, GpuMat& dst, const GpuMat& mask, St ...@@ -1993,7 +1993,7 @@ void cv::gpu::bitwise_not(const GpuMat& src, GpuMat& dst, const GpuMat& mask, St
} }
else else
{ {
bitMatNot<unsigned short>( bitMatNot<unsigned char>(
PtrStepSzb(src.rows, bcols, src.data, src.step), PtrStepSzb(src.rows, bcols, src.data, src.step),
PtrStepSzb(src.rows, bcols, dst.data, dst.step), PtrStepSzb(src.rows, bcols, dst.data, dst.step),
mask, stream); mask, stream);
...@@ -2040,7 +2040,7 @@ void cv::gpu::bitwise_and(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c ...@@ -2040,7 +2040,7 @@ void cv::gpu::bitwise_and(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c
{ {
const int vcols = bcols >> 1; const int vcols = bcols >> 1;
bitMatAnd<unsigned int>( bitMatAnd<unsigned short>(
PtrStepSzb(src1.rows, vcols, src1.data, src1.step), PtrStepSzb(src1.rows, vcols, src1.data, src1.step),
PtrStepSzb(src1.rows, vcols, src2.data, src2.step), PtrStepSzb(src1.rows, vcols, src2.data, src2.step),
PtrStepSzb(src1.rows, vcols, dst.data, dst.step), PtrStepSzb(src1.rows, vcols, dst.data, dst.step),
...@@ -2049,7 +2049,7 @@ void cv::gpu::bitwise_and(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c ...@@ -2049,7 +2049,7 @@ void cv::gpu::bitwise_and(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c
else else
{ {
bitMatAnd<unsigned int>( bitMatAnd<unsigned char>(
PtrStepSzb(src1.rows, bcols, src1.data, src1.step), PtrStepSzb(src1.rows, bcols, src1.data, src1.step),
PtrStepSzb(src1.rows, bcols, src2.data, src2.step), PtrStepSzb(src1.rows, bcols, src2.data, src2.step),
PtrStepSzb(src1.rows, bcols, dst.data, dst.step), PtrStepSzb(src1.rows, bcols, dst.data, dst.step),
...@@ -2087,7 +2087,7 @@ void cv::gpu::bitwise_or(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, co ...@@ -2087,7 +2087,7 @@ void cv::gpu::bitwise_or(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, co
{ {
const int vcols = bcols >> 1; const int vcols = bcols >> 1;
bitMatOr<unsigned int>( bitMatOr<unsigned short>(
PtrStepSzb(src1.rows, vcols, src1.data, src1.step), PtrStepSzb(src1.rows, vcols, src1.data, src1.step),
PtrStepSzb(src1.rows, vcols, src2.data, src2.step), PtrStepSzb(src1.rows, vcols, src2.data, src2.step),
PtrStepSzb(src1.rows, vcols, dst.data, dst.step), PtrStepSzb(src1.rows, vcols, dst.data, dst.step),
...@@ -2096,7 +2096,7 @@ void cv::gpu::bitwise_or(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, co ...@@ -2096,7 +2096,7 @@ void cv::gpu::bitwise_or(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, co
else else
{ {
bitMatOr<unsigned int>( bitMatOr<unsigned char>(
PtrStepSzb(src1.rows, bcols, src1.data, src1.step), PtrStepSzb(src1.rows, bcols, src1.data, src1.step),
PtrStepSzb(src1.rows, bcols, src2.data, src2.step), PtrStepSzb(src1.rows, bcols, src2.data, src2.step),
PtrStepSzb(src1.rows, bcols, dst.data, dst.step), PtrStepSzb(src1.rows, bcols, dst.data, dst.step),
...@@ -2134,7 +2134,7 @@ void cv::gpu::bitwise_xor(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c ...@@ -2134,7 +2134,7 @@ void cv::gpu::bitwise_xor(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c
{ {
const int vcols = bcols >> 1; const int vcols = bcols >> 1;
bitMatXor<unsigned int>( bitMatXor<unsigned short>(
PtrStepSzb(src1.rows, vcols, src1.data, src1.step), PtrStepSzb(src1.rows, vcols, src1.data, src1.step),
PtrStepSzb(src1.rows, vcols, src2.data, src2.step), PtrStepSzb(src1.rows, vcols, src2.data, src2.step),
PtrStepSzb(src1.rows, vcols, dst.data, dst.step), PtrStepSzb(src1.rows, vcols, dst.data, dst.step),
...@@ -2143,7 +2143,7 @@ void cv::gpu::bitwise_xor(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c ...@@ -2143,7 +2143,7 @@ void cv::gpu::bitwise_xor(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c
else else
{ {
bitMatXor<unsigned int>( bitMatXor<unsigned char>(
PtrStepSzb(src1.rows, bcols, src1.data, src1.step), PtrStepSzb(src1.rows, bcols, src1.data, src1.step),
PtrStepSzb(src1.rows, bcols, src2.data, src2.step), PtrStepSzb(src1.rows, bcols, src2.data, src2.step),
PtrStepSzb(src1.rows, bcols, dst.data, dst.step), PtrStepSzb(src1.rows, bcols, dst.data, dst.step),
......
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