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

switched to Input/Output Array in split/merge operations

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-25 16:02:41 +04:00
parent 58c4d0eaeb
commit 3d8ca010b7
3 changed files with 49 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpuarithm/src/cuda/split_merge.cu
View File

@@ -278,7 +278,7 @@ namespace cv { namespace gpu { namespace cudev
}
void merge_caller(const PtrStepSzb* src, PtrStepSzb& dst,
void merge(const PtrStepSzb* src, PtrStepSzb& dst,
int total_channels, size_t elem_size,
const cudaStream_t& stream)
{
@@ -487,7 +487,7 @@ namespace cv { namespace gpu { namespace cudev
}
void split_caller(const PtrStepSzb& src, PtrStepSzb* dst, int num_channels, size_t elem_size1, const cudaStream_t& stream)
void split(const PtrStepSzb& src, PtrStepSzb* dst, int num_channels, size_t elem_size1, const cudaStream_t& stream)
{
static SplitFunction split_func_tbl[] =
{