potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

fixed some compile-time problems (under Ubuntu)

Browse Source
This commit is contained in:
Alexey Spizhevoy
2010-09-28 13:11:21 +00:00
parent bf25758159
commit 12b7f3a0d0
3 changed files with 115 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/src/split_merge.cpp
+6 -4
View File
@@ -100,8 +100,9 @@ namespace cv { namespace gpu { namespace split_merge
for(size_t i = 0; i < n; ++i)
src_as_devmem[i] = src[i];
split_merge::merge_caller(src_as_devmem, (DevMem2D)dst,
total_channels, CV_ELEM_SIZE(depth),
DevMem2D dst_as_devmem(dst);
split_merge::merge_caller(src_as_devmem, dst_as_devmem,
total_channels, CV_ELEM_SIZE(depth),
stream);
}
}
@@ -130,7 +131,8 @@ namespace cv { namespace gpu { namespace split_merge
for (int i = 0; i < num_channels; ++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(),
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));
}
#endif /* !defined (HAVE_CUDA) */
#endif /* !defined (HAVE_CUDA) */