From 489a1da0ed1cd8584fb14d2eaaa2d818cefe17f7 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 2 Apr 2012 08:20:23 +0000 Subject: [PATCH] fixeg gpu::Laplacian --- modules/gpu/include/opencv2/gpu/gpu.hpp | 6 +++--- modules/gpu/src/filtering.cpp | 16 ++++++++-------- modules/gpu/test/test_filters.cpp | 5 +---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp index 949acba..db5aa43 100644 --- a/modules/gpu/include/opencv2/gpu/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu/gpu.hpp @@ -395,7 +395,7 @@ CV_EXPORTS void GaussianBlur(const GpuMat& src, GpuMat& dst, Size ksize, GpuMat& //! applies Laplacian operator to the image //! supports only ksize = 1 and ksize = 3 -CV_EXPORTS void Laplacian(const GpuMat& src, GpuMat& dst, int ddepth, int ksize = 1, double scale = 1, Stream& stream = Stream::Null()); +CV_EXPORTS void Laplacian(const GpuMat& src, GpuMat& dst, int ddepth, int ksize = 1, double scale = 1, int borderType = BORDER_DEFAULT, Stream& stream = Stream::Null()); ////////////////////////////// Arithmetics /////////////////////////////////// @@ -1094,8 +1094,8 @@ public: bool use_local_init_data_cost; private: - GpuMat messages_buffers; - + GpuMat messages_buffers; + GpuMat temp; GpuMat out; }; diff --git a/modules/gpu/src/filtering.cpp b/modules/gpu/src/filtering.cpp index 2349857..ebf9900 100644 --- a/modules/gpu/src/filtering.cpp +++ b/modules/gpu/src/filtering.cpp @@ -87,7 +87,7 @@ void cv::gpu::Scharr(const GpuMat&, GpuMat&, int, int, int, double, int, int) { void cv::gpu::Scharr(const GpuMat&, GpuMat&, int, int, int, GpuMat&, double, int, int, Stream&) { throw_nogpu(); } void cv::gpu::GaussianBlur(const GpuMat&, GpuMat&, Size, double, double, int, int) { throw_nogpu(); } void cv::gpu::GaussianBlur(const GpuMat&, GpuMat&, Size, GpuMat&, double, double, int, int, Stream&) { throw_nogpu(); } -void cv::gpu::Laplacian(const GpuMat&, GpuMat&, int, int, double, Stream&) { throw_nogpu(); } +void cv::gpu::Laplacian(const GpuMat&, GpuMat&, int, int, double, int, Stream&) { throw_nogpu(); } #else @@ -664,8 +664,8 @@ namespace cv { namespace gpu { namespace device namespace imgproc { template - void filter2D_gpu(DevMem2Db srcWhole, int ofsX, int ofsY, DevMem2Db dst, - int kWidth, int kHeight, int anchorX, int anchorY, const float* kernel, + void filter2D_gpu(DevMem2Db srcWhole, int ofsX, int ofsY, DevMem2Db dst, + int kWidth, int kHeight, int anchorX, int anchorY, const float* kernel, int borderMode, const float* borderValue, cudaStream_t stream); } }}} @@ -708,14 +708,14 @@ namespace nppFilter2D_t func; }; - typedef void (*gpuFilter2D_t)(DevMem2Db srcWhole, int ofsX, int ofsY, DevMem2Db dst, - int kWidth, int kHeight, int anchorX, int anchorY, const float* kernel, + typedef void (*gpuFilter2D_t)(DevMem2Db srcWhole, int ofsX, int ofsY, DevMem2Db dst, + int kWidth, int kHeight, int anchorX, int anchorY, const float* kernel, int borderMode, const float* borderValue, cudaStream_t stream); struct GpuFilter2D : public BaseFilter_GPU { GpuFilter2D(Size ksize_, Point anchor_, gpuFilter2D_t func_, const GpuMat& kernel_, int brd_type_) : - BaseFilter_GPU(ksize_, anchor_), func(func_), kernel(kernel_), brd_type(brd_type_) + BaseFilter_GPU(ksize_, anchor_), func(func_), kernel(kernel_), brd_type(brd_type_) { } @@ -1193,7 +1193,7 @@ void cv::gpu::Scharr(const GpuMat& src, GpuMat& dst, int ddepth, int dx, int dy, sepFilter2D(src, dst, ddepth, kx, ky, buf, Point(-1,-1), rowBorderType, columnBorderType, stream); } -void cv::gpu::Laplacian(const GpuMat& src, GpuMat& dst, int ddepth, int ksize, double scale, Stream& stream) +void cv::gpu::Laplacian(const GpuMat& src, GpuMat& dst, int ddepth, int ksize, double scale, int borderType, Stream& stream) { CV_Assert(ksize == 1 || ksize == 3); @@ -1206,7 +1206,7 @@ void cv::gpu::Laplacian(const GpuMat& src, GpuMat& dst, int ddepth, int ksize, d if (scale != 1) kernel *= scale; - filter2D(src, dst, ddepth, kernel, Point(-1,-1), stream); + filter2D(src, dst, ddepth, kernel, Point(-1,-1), borderType, stream); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/modules/gpu/test/test_filters.cpp b/modules/gpu/test/test_filters.cpp index 6f7b8d9..99c463b 100644 --- a/modules/gpu/test/test_filters.cpp +++ b/modules/gpu/test/test_filters.cpp @@ -334,10 +334,7 @@ TEST_P(Laplacian, Accuracy) cv::Mat dst_gold; cv::Laplacian(src, dst_gold, -1, ksize.width); - if (type == CV_32FC1) - EXPECT_MAT_NEAR(dst_gold, dst, 0.0); - else - EXPECT_MAT_NEAR(getInnerROI(dst_gold, cv::Size(3, 3)), getInnerROI(dst, cv::Size(3, 3)), 0.0); + EXPECT_MAT_NEAR(dst_gold, dst, 0.0); } INSTANTIATE_TEST_CASE_P(GPU_Filter, Laplacian, testing::Combine( -- 2.7.4