Skip to content

O
opencv
Commit 12b7f3a0 authored by Alexey Spizhevoy's avatar Alexey Spizhevoy
Browse files
Options

fixed some compile-time problems (under Ubuntu)

parent bf257581
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/gpu/src/cuda/split_merge.cu
View file @ 12b7f3a0
This diff is collapsed.
modules/gpu/src/split_merge.cpp
View file @ 12b7f3a0
...@@ -100,8 +100,9 @@ namespace cv { namespace gpu { namespace split_merge ...@@ -100,8 +100,9 @@ namespace cv { namespace gpu { namespace split_merge
for(size_t i = 0; i < n; ++i) for(size_t i = 0; i < n; ++i)
src_as_devmem[i] = src[i]; src_as_devmem[i] = src[i];
split_merge::merge_caller(src_as_devmem, (DevMem2D)dst, DevMem2D dst_as_devmem(dst);
total_channels, CV_ELEM_SIZE(depth), split_merge::merge_caller(src_as_devmem, dst_as_devmem,
total_channels, CV_ELEM_SIZE(depth),
stream); stream);
} }
} }
...@@ -130,7 +131,8 @@ namespace cv { namespace gpu { namespace split_merge ...@@ -130,7 +131,8 @@ namespace cv { namespace gpu { namespace split_merge
for (int i = 0; i < num_channels; ++i) for (int i = 0; i < num_channels; ++i)
dst_as_devmem[i] = dst[i]; dst_as_devmem[i] = dst[i];
split_merge::split_caller((DevMem2D)src, dst_as_devmem, DevMem2D src_as_devmem(src);
split_merge::split_caller(src_as_devmem, dst_as_devmem,
num_channels, src.elemSize1(), num_channels, src.elemSize1(),
stream); stream);
} }
...@@ -190,4 +192,4 @@ void cv::gpu::split(const GpuMat& src, vector<GpuMat>& dst, const Stream& stream ...@@ -190,4 +192,4 @@ void cv::gpu::split(const GpuMat& src, vector<GpuMat>& dst, const Stream& stream
split_merge::split(src, &dst[0], StreamAccessor::getStream(stream)); split_merge::split(src, &dst[0], StreamAccessor::getStream(stream));
} }
#endif /* !defined (HAVE_CUDA) */ #endif /* !defined (HAVE_CUDA) */
\ No newline at end of file
tests/gpu/src/imgproc_gpu.cpp
View file @ 12b7f3a0
...@@ -379,7 +379,7 @@ struct CV_GpuNppImageIntegralTest : public CV_GpuImageProcTest ...@@ -379,7 +379,7 @@ struct CV_GpuNppImageIntegralTest : public CV_GpuImageProcTest
{ {
CV_GpuNppImageIntegralTest() : CV_GpuImageProcTest( "GPU-NppImageIntegral", "integral" ) {} CV_GpuNppImageIntegralTest() : CV_GpuImageProcTest( "GPU-NppImageIntegral", "integral" ) {}
int CV_GpuNppImageIntegralTest::test(const Mat& img) int test(const Mat& img)
{ {
if (img.type() != CV_8UC1) if (img.type() != CV_8UC1)
{ {
...@@ -554,4 +554,4 @@ CV_GpuNppImageWarpAffineTest CV_GpuNppImageWarpAffine_test; ...@@ -554,4 +554,4 @@ CV_GpuNppImageWarpAffineTest CV_GpuNppImageWarpAffine_test;
CV_GpuNppImageWarpPerspectiveTest CV_GpuNppImageWarpPerspective_test; CV_GpuNppImageWarpPerspectiveTest CV_GpuNppImageWarpPerspective_test;
CV_GpuNppImageIntegralTest CV_GpuNppImageIntegral_test; CV_GpuNppImageIntegralTest CV_GpuNppImageIntegral_test;
CV_GpuNppImageBlurTest CV_GpuNppImageBlur_test; CV_GpuNppImageBlurTest CV_GpuNppImageBlur_test;
CV_GpuCvtColorTest CV_GpuCvtColor_test; CV_GpuCvtColorTest CV_GpuCvtColor_test;
\ No newline at end of file
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