fixed some compile-time problems (under Ubuntu)

modules/gpu/src/split_merge.cpp

@@ -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) */
\ No newline at end of file
+#endif /* !defined (HAVE_CUDA) */

tests/gpu/src/imgproc_gpu.cpp

@@ -379,7 +379,7 @@ struct CV_GpuNppImageIntegralTest : public CV_GpuImageProcTest
 {
     CV_GpuNppImageIntegralTest() : CV_GpuImageProcTest( "GPU-NppImageIntegral", "integral" ) {}
 
-    int CV_GpuNppImageIntegralTest::test(const Mat& img)
+    int test(const Mat& img)
     {
         if (img.type() != CV_8UC1)
         {
@@ -554,4 +554,4 @@ CV_GpuNppImageWarpAffineTest CV_GpuNppImageWarpAffine_test;
 CV_GpuNppImageWarpPerspectiveTest CV_GpuNppImageWarpPerspective_test;
 CV_GpuNppImageIntegralTest CV_GpuNppImageIntegral_test;
 CV_GpuNppImageBlurTest CV_GpuNppImageBlur_test;
-CV_GpuCvtColorTest CV_GpuCvtColor_test;
\ No newline at end of file
+CV_GpuCvtColorTest CV_GpuCvtColor_test;