merged all the latest changes from 2.4 to trunk

modules/gpu/test/nvidia/TestRectStdDev.h

@@ -33,9 +33,9 @@ private:
 	TestRectStdDev& operator=(const TestRectStdDev&);	
 
     NCVTestSourceProvider<Ncv8u> &src;
-    NcvRect32u rect;
     Ncv32u width;
     Ncv32u height;
+    NcvRect32u rect;
     Ncv32f scaleFactor;
 
     NcvBool bTextureCache;

modules/gpu/test/test_calib3d.cpp

@@ -249,7 +249,7 @@ TEST_P(ProjectPoints, Accuracy)
 
     for (size_t i = 0; i < dst_gold.size(); ++i)
     {
-        cv::Point2f res = h_dst.at<cv::Point2f>(0, i);
+        cv::Point2f res = h_dst.at<cv::Point2f>(0, (int)i);
         cv::Point2f res_gold = dst_gold[i];
 
         ASSERT_LE(cv::norm(res_gold - res) / cv::norm(res_gold), 1e-3f);
@@ -291,7 +291,7 @@ TEST_P(SolvePnPRansac, Accuracy)
 
     cv::Mat rvec, tvec;
     std::vector<int> inliers;
-    cv::gpu::solvePnPRansac(object, cv::Mat(1, image_vec.size(), CV_32FC2, &image_vec[0]),
+    cv::gpu::solvePnPRansac(object, cv::Mat(1, (int)image_vec.size(), CV_32FC2, &image_vec[0]),
                             camera_mat, cv::Mat(1, 8, CV_32F, cv::Scalar::all(0)),
                             rvec, tvec, false, 200, 2.f, 100, &inliers);
 

modules/gpu/test/test_video.cpp

@@ -244,7 +244,7 @@ TEST_P(PyrLKOpticalFlow, Sparse)
     cv::goodFeaturesToTrack(gray_frame, pts, 1000, 0.01, 0.0);
 
     cv::gpu::GpuMat d_pts;
-    cv::Mat pts_mat(1, pts.size(), CV_32FC2, (void*)&pts[0]);
+    cv::Mat pts_mat(1, (int)pts.size(), CV_32FC2, (void*)&pts[0]);
     d_pts.upload(pts_mat);
 
     cv::gpu::PyrLKOpticalFlow pyrLK;

modules/gpu/test/utility.cpp

@@ -195,7 +195,7 @@ Mat getMat(InputArray arr)
     return arr.getMat();
 }
 
-double checkNorm(InputArray m1, const InputArray m2)
+double checkNorm(InputArray m1, InputArray m2)
 {
     return norm(getMat(m1), getMat(m2), NORM_INF);
 }