generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed gpu BORDER_* constants

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-11 14:53:35 +04:00
parent d5ee931287
commit 43d5e2d8b4
21 changed files with 196 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/photo/src/cuda/nlm.cu
View File

@@ -161,11 +161,11 @@ namespace cv { namespace gpu { namespace cudev
static func_t funcs[] =
{
nlm_caller<T, BrdReflect101>,
nlm_caller<T, BrdReplicate>,
nlm_caller<T, BrdConstant>,
nlm_caller<T, BrdReplicate>,
nlm_caller<T, BrdReflect>,
nlm_caller<T, BrdWrap>,
nlm_caller<T, BrdReflect101>
};
funcs[borderMode](src, dst, search_radius, block_radius, h, stream);
}

5
modules/photo/src/denoising_gpu.cpp
View File

@@ -85,11 +85,8 @@ void cv::gpu::nonLocalMeans(const GpuMat& src, GpuMat& dst, float h, int search_
int b = borderMode;
CV_Assert(b == BORDER_REFLECT101 || b == BORDER_REPLICATE || b == BORDER_CONSTANT || b == BORDER_REFLECT || b == BORDER_WRAP);
int gpuBorderType;
CV_Assert(tryConvertToGpuBorderType(borderMode, gpuBorderType));
dst.create(src.size(), src.type());
func(src, dst, search_window/2, block_window/2, h, gpuBorderType, StreamAccessor::getStream(s));
func(src, dst, search_window/2, block_window/2, h, borderMode, StreamAccessor::getStream(s));
}
namespace cv { namespace gpu { namespace cudev