Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/ccalib/src/ccalib.cpp

@@ -445,8 +445,13 @@ bool CustomPattern::findRtRANSAC(InputArray objectPoints, InputArray imagePoints
                                  InputOutputArray rvec, InputOutputArray tvec, bool useExtrinsicGuess, int iterationsCount,
                                  float reprojectionError, int minInliersCount, OutputArray inliers, int flags)
 {
+    int npoints = imagePoints.getMat().checkVector(2);
+    CV_Assert(npoints > 0);
+    double confidence_factor = (double)minInliersCount / (double)npoints;
+    double confidence = confidence_factor < 0.001 ? 0.001 : confidence_factor > 0.999 ? 0.999 : confidence_factor;
+
     solvePnPRansac(objectPoints, imagePoints, cameraMatrix, distCoeffs, rvec, tvec, useExtrinsicGuess,
-                   iterationsCount, reprojectionError, minInliersCount, inliers, flags);
+                   iterationsCount, reprojectionError, confidence, inliers, flags);
     return true; // for consistency with the other methods
 }
 
@@ -459,8 +464,12 @@ bool CustomPattern::findRtRANSAC(InputArray image, InputArray cameraMatrix, Inpu
 
     if (!findPattern(image, imagePoints, objectPoints))
         return false;
+
+    double confidence_factor = (double)minInliersCount / (double)imagePoints.size();
+    double confidence = confidence_factor < 0.001 ? 0.001 : confidence_factor > 0.999 ? 0.999 : confidence_factor;
+
     solvePnPRansac(objectPoints, imagePoints, cameraMatrix, distCoeffs, rvec, tvec, useExtrinsicGuess,
-                   iterationsCount, reprojectionError, minInliersCount, inliers, flags);
+                   iterationsCount, reprojectionError, confidence, inliers, flags);
     return true;
 }
 

modules/face/src/regtree.cpp

@@ -245,7 +245,7 @@ bool FacemarkKazemiImpl :: buildRegtree(regtree& tree,vector<training_sample>& s
     while(!curr.empty()){
         pair<long,long> range= make_pair(curr.front().index1,curr.front().index2);
         long node_no = curr.front().node_no;
-        splitr split;
+        splitr split = {0, 0, 0};
         //generate a split
         if(node_no<=numSplitNodes){
             if(generateSplit(curr,pixel_coordinates,samples,split,sum)){