modified kernel setto(), added double type, code has been improved

modules/gpu/src/cuda/cuda_shared.hpp

@@ -61,8 +61,8 @@ namespace cv
         {
             static inline int divUp(int a, int b) { return (a % b == 0) ? a/b : a/b + 1; }
 
-            extern "C" void set_to_without_mask (const DevMem2D& mat, const double * scalar, int depth, int channels);
-            extern "C" void set_to_with_mask    (const DevMem2D& mat, const double * scalar, const DevMem2D& mask, int depth, int channels);
+            extern "C" void set_to_without_mask (const DevMem2D& mat, int depth, const double * scalar, int channels);
+            extern "C" void set_to_with_mask    (const DevMem2D& mat, int depth, const double * scalar, const DevMem2D& mask, int channels);
 
             extern "C" void convert_to(const DevMem2D& src, int sdepth, DevMem2D dst, int ddepth, size_t width, size_t height, double alpha, double beta);
         }

modules/gpu/src/matrix_operations.cpp

@@ -126,14 +126,14 @@ void cv::gpu::GpuMat::convertTo( GpuMat& dst, int rtype, double alpha, double be
     const GpuMat* psrc = this;
     if( sdepth != ddepth && psrc == &dst )
         psrc = &(temp = *this);
-        
+
     dst.create( size(), rtype );
     impl::convert_to(*psrc, sdepth, dst, ddepth, psrc->cols * psrc->channels(), psrc->rows, alpha, beta);
 }
 
 GpuMat& GpuMat::operator = (const Scalar& s)
 {
-    cv::gpu::impl::set_to_without_mask(*this, s.val, this->elemSize1(), this->channels());
+    cv::gpu::impl::set_to_without_mask( *this, this->depth(), s.val, this->channels());
     return *this;
 }
 
@@ -145,11 +145,11 @@ GpuMat& GpuMat::setTo(const Scalar& s, const GpuMat& mask)
 
     if (mask.empty())
     {
-        cv::gpu::impl::set_to_without_mask(*this, s.val, this->elemSize1(), this->channels());
+        cv::gpu::impl::set_to_without_mask( *this, this->depth(), s.val, this->channels());
     }
     else
     {
-        cv::gpu::impl::set_to_with_mask(*this, s.val, mask, this->elemSize1(), this->channels());
+        cv::gpu::impl::set_to_with_mask( *this, this->depth(), s.val, mask, this->channels());
     }
 
     return *this;

tests/gpu/src/operator_set_to.cpp

@@ -24,19 +24,6 @@ class CV_GpuMatOpSetTo : public CvTest
 
         bool compare_matrix(cv::Mat & cpumat, gpu::GpuMat & gpumat);
 
-        bool test_cv_8u_c1();
-        bool test_cv_8u_c2();
-        bool test_cv_8u_c3();
-        bool test_cv_8u_c4();
-
-        bool test_cv_16u_c4();
-
-        bool test_cv_32f_c1();
-        bool test_cv_32f_c2();
-        bool test_cv_32f_c3();
-        bool test_cv_32f_c4();
-
-
     private:
         int rows;
         int cols;
@@ -45,13 +32,13 @@ class CV_GpuMatOpSetTo : public CvTest
 
 CV_GpuMatOpSetTo::CV_GpuMatOpSetTo(): CvTest( "GpuMatOperatorSetTo", "setTo" )
 {
-    rows = 129;
-    cols = 127;
+    rows = 256;
+    cols = 124;
 
-    s.val[0] = 128.0;
-    s.val[1] = 128.0;
-    s.val[2] = 128.0;
-    s.val[3] = 128.0;
+    s.val[0] = 127.0;
+    s.val[1] = 127.0;
+    s.val[2] = 127.0;
+    s.val[3] = 127.0;
 
     //#define PRINT_MATRIX
 }
@@ -99,95 +86,16 @@ bool CV_GpuMatOpSetTo::compare_matrix(cv::Mat & cpumat, gpu::GpuMat & gpumat)
     }
 }
 
-
-bool CV_GpuMatOpSetTo::test_cv_8u_c1()
-{
-    Mat cpumat(rows, cols, CV_8U, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_8u_c2()
-{
-    Mat cpumat(rows, cols, CV_8UC2, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_8u_c3()
-{
-    Mat cpumat(rows, cols, CV_8UC3, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_8u_c4()
-{
-    Mat cpumat(rows, cols, CV_8UC4, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_16u_c4()
-{
-    Mat cpumat(rows, cols, CV_16UC4, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-
-bool CV_GpuMatOpSetTo::test_cv_32f_c1()
-{
-    Mat cpumat(rows, cols, CV_32F, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_32f_c2()
-{
-    Mat cpumat(rows, cols, CV_32FC2, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_32f_c3()
-{
-    Mat cpumat(rows, cols, CV_32FC3, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
-bool CV_GpuMatOpSetTo::test_cv_32f_c4()
-{
-    Mat cpumat(rows, cols, CV_32FC4, Scalar::all(0));
-    GpuMat gpumat(cpumat);
-
-    return compare_matrix(cpumat, gpumat);
-}
-
 void CV_GpuMatOpSetTo::run( int /* start_from */)
 {
     bool is_test_good = true;
 
-    is_test_good &= test_cv_8u_c1();
-    is_test_good &= test_cv_8u_c2();
-    is_test_good &= test_cv_8u_c3();
-    is_test_good &= test_cv_8u_c4();
-
-    is_test_good &= test_cv_16u_c4();
-
-    is_test_good &= test_cv_32f_c1();
-    is_test_good &= test_cv_32f_c2();
-    is_test_good &= test_cv_32f_c3();
-    is_test_good &= test_cv_32f_c4();
+    for (int i = 0; i < 7; i++)
+    {
+        Mat cpumat(rows, cols, i, Scalar::all(0));
+        GpuMat gpumat(cpumat);
+        is_test_good &= compare_matrix(cpumat, gpumat);
+    }
 
     if (is_test_good == true)
         ts->set_failed_test_info(CvTS::OK);