fixed several bugs in gpu arithm functions

refactored tests for them

modules/gpu/include/opencv2/gpu/gpu.hpp

@@ -638,11 +638,11 @@ CV_EXPORTS void bitwise_xor(const GpuMat& src1, const Scalar& sc, GpuMat& dst, S
 
 //! pixel by pixel right shift of an image by a constant value
 //! supports 1, 3 and 4 channels images with integers elements
-CV_EXPORTS void rshift(const GpuMat& src, const Scalar& sc, GpuMat& dst, Stream& stream = Stream::Null());
+CV_EXPORTS void rshift(const GpuMat& src, Scalar_<int> sc, GpuMat& dst, Stream& stream = Stream::Null());
 
 //! pixel by pixel left shift of an image by a constant value
 //! supports 1, 3 and 4 channels images with CV_8U, CV_16U or CV_32S depth
-CV_EXPORTS void lshift(const GpuMat& src, const Scalar& sc, GpuMat& dst, Stream& stream = Stream::Null());
+CV_EXPORTS void lshift(const GpuMat& src, Scalar_<int> sc, GpuMat& dst, Stream& stream = Stream::Null());
 
 //! computes per-element minimum of two arrays (dst = min(src1, src2))
 CV_EXPORTS void min(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, Stream& stream = Stream::Null());

modules/gpu/test/utility.hpp

@@ -162,10 +162,37 @@ CV_FLAGS(DftFlags, cv::DFT_INVERSE, cv::DFT_SCALE, cv::DFT_ROWS, cv::DFT_COMPLEX
 #define ALL_DEVICES testing::ValuesIn(devices())
 #define DEVICES(feature) testing::ValuesIn(devices(feature))
 
+#define DIFFERENT_SIZES testing::Values(cv::Size(128, 128), cv::Size(113, 113))
+
+#define ALL_DEPTH testing::Values(MatDepth(CV_8U), MatDepth(CV_8S), MatDepth(CV_16U), MatDepth(CV_16S), MatDepth(CV_32S), MatDepth(CV_32F), MatDepth(CV_64F))
 #define ALL_TYPES testing::ValuesIn(all_types())
 #define TYPES(depth_start, depth_end, cn_start, cn_end) testing::ValuesIn(types(depth_start, depth_end, cn_start, cn_end))
 
-#define DIFFERENT_SIZES testing::Values(cv::Size(128, 128), cv::Size(113, 113))
+#define DEPTH_PAIRS testing::Values(std::make_pair(MatDepth(CV_8U), MatDepth(CV_8U)),   \
+                                    std::make_pair(MatDepth(CV_8U), MatDepth(CV_16U)),  \
+                                    std::make_pair(MatDepth(CV_8U), MatDepth(CV_16S)),  \
+                                    std::make_pair(MatDepth(CV_8U), MatDepth(CV_32S)),  \
+                                    std::make_pair(MatDepth(CV_8U), MatDepth(CV_32F)),  \
+                                    std::make_pair(MatDepth(CV_8U), MatDepth(CV_64F)),  \
+                                                                                        \
+                                    std::make_pair(MatDepth(CV_16U), MatDepth(CV_16U)), \
+                                    std::make_pair(MatDepth(CV_16U), MatDepth(CV_32S)), \
+                                    std::make_pair(MatDepth(CV_16U), MatDepth(CV_32F)), \
+                                    std::make_pair(MatDepth(CV_16U), MatDepth(CV_64F)), \
+                                                                                        \
+                                    std::make_pair(MatDepth(CV_16S), MatDepth(CV_16S)), \
+                                    std::make_pair(MatDepth(CV_16S), MatDepth(CV_32S)), \
+                                    std::make_pair(MatDepth(CV_16S), MatDepth(CV_32F)), \
+                                    std::make_pair(MatDepth(CV_16S), MatDepth(CV_64F)), \
+                                                                                        \
+                                    std::make_pair(MatDepth(CV_32S), MatDepth(CV_32S)), \
+                                    std::make_pair(MatDepth(CV_32S), MatDepth(CV_32F)), \
+                                    std::make_pair(MatDepth(CV_32S), MatDepth(CV_64F)), \
+                                                                                        \
+                                    std::make_pair(MatDepth(CV_32F), MatDepth(CV_32F)), \
+                                    std::make_pair(MatDepth(CV_32F), MatDepth(CV_64F)), \
+                                                                                        \
+                                    std::make_pair(MatDepth(CV_64F), MatDepth(CV_64F)))
 
 #define WHOLE testing::Values(UseRoi(false))
 #define SUBMAT testing::Values(UseRoi(true))
@@ -173,4 +200,6 @@ CV_FLAGS(DftFlags, cv::DFT_INVERSE, cv::DFT_SCALE, cv::DFT_ROWS, cv::DFT_COMPLEX
 
 #define DIRECT_INVERSE testing::Values(Inverse(false), Inverse(true))
 
+#define ALL_CMP_CODES testing::Values(CmpCode(cv::CMP_EQ), CmpCode(cv::CMP_NE), CmpCode(cv::CMP_GT), CmpCode(cv::CMP_GE), CmpCode(cv::CMP_LT), CmpCode(cv::CMP_LE))
+
 #endif // __OPENCV_TEST_UTILITY_HPP__