switched to new device layer in split/merge

modules/cudaarithm/src/core.cpp

@@ -63,117 +63,6 @@ void cv::cuda::copyMakeBorder(InputArray, OutputArray, int, int, int, int, int,
 
 #else /* !defined (HAVE_CUDA) */
 
-////////////////////////////////////////////////////////////////////////
-// merge/split
-
-namespace cv { namespace cuda { namespace device
-{
-    namespace split_merge
-    {
-        void merge(const PtrStepSzb* src, PtrStepSzb& dst, int total_channels, size_t elem_size, const cudaStream_t& stream);
-        void split(const PtrStepSzb& src, PtrStepSzb* dst, int num_channels, size_t elem_size1, const cudaStream_t& stream);
-    }
-}}}
-
-namespace
-{
-    void merge_caller(const GpuMat* src, size_t n, OutputArray _dst, Stream& stream)
-    {
-        CV_Assert( src != 0 );
-        CV_Assert( n > 0 && n <= 4 );
-
-        const int depth = src[0].depth();
-        const Size size = src[0].size();
-
-        for (size_t i = 0; i < n; ++i)
-        {
-            CV_Assert( src[i].size() == size );
-            CV_Assert( src[i].depth() == depth );
-            CV_Assert( src[i].channels() == 1 );
-        }
-
-        if (depth == CV_64F)
-        {
-            if (!deviceSupports(NATIVE_DOUBLE))
-                CV_Error(cv::Error::StsUnsupportedFormat, "The device doesn't support double");
-        }
-
-        if (n == 1)
-        {
-            src[0].copyTo(_dst, stream);
-        }
-        else
-        {
-            _dst.create(size, CV_MAKE_TYPE(depth, (int)n));
-            GpuMat dst = _dst.getGpuMat();
-
-            PtrStepSzb src_as_devmem[4];
-            for(size_t i = 0; i < n; ++i)
-                src_as_devmem[i] = src[i];
-
-            PtrStepSzb dst_as_devmem(dst);
-            cv::cuda::device::split_merge::merge(src_as_devmem, dst_as_devmem, (int)n, CV_ELEM_SIZE(depth), StreamAccessor::getStream(stream));
-        }
-    }
-
-    void split_caller(const GpuMat& src, GpuMat* dst, Stream& stream)
-    {
-        CV_Assert( dst != 0 );
-
-        const int depth = src.depth();
-        const int num_channels = src.channels();
-
-        CV_Assert( num_channels <= 4 );
-
-        if (depth == CV_64F)
-        {
-            if (!deviceSupports(NATIVE_DOUBLE))
-                CV_Error(cv::Error::StsUnsupportedFormat, "The device doesn't support double");
-        }
-
-        if (num_channels == 1)
-        {
-            src.copyTo(dst[0], stream);
-            return;
-        }
-
-        for (int i = 0; i < num_channels; ++i)
-            dst[i].create(src.size(), depth);
-
-        PtrStepSzb dst_as_devmem[4];
-        for (int i = 0; i < num_channels; ++i)
-            dst_as_devmem[i] = dst[i];
-
-        PtrStepSzb src_as_devmem(src);
-        cv::cuda::device::split_merge::split(src_as_devmem, dst_as_devmem, num_channels, src.elemSize1(), StreamAccessor::getStream(stream));
-    }
-}
-
-void cv::cuda::merge(const GpuMat* src, size_t n, OutputArray dst, Stream& stream)
-{
-    merge_caller(src, n, dst, stream);
-}
-
-
-void cv::cuda::merge(const std::vector<GpuMat>& src, OutputArray dst, Stream& stream)
-{
-    merge_caller(&src[0], src.size(), dst, stream);
-}
-
-void cv::cuda::split(InputArray _src, GpuMat* dst, Stream& stream)
-{
-    GpuMat src = _src.getGpuMat();
-    split_caller(src, dst, stream);
-}
-
-void cv::cuda::split(InputArray _src, std::vector<GpuMat>& dst, Stream& stream)
-{
-    GpuMat src = _src.getGpuMat();
-    dst.resize(src.channels());
-    if(src.channels() > 0)
-        split_caller(src, &dst[0], stream);
-}
-
 ////////////////////////////////////////////////////////////////////////
 // transpose