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

Author: alalek

modules/aruco/samples/tutorial_charuco_create_detect.cpp

@@ -21,7 +21,7 @@ static bool readCameraParameters(std::string filename, cv::Mat& camMatrix, cv::M
         return false;
     fs["camera_matrix"] >> camMatrix;
     fs["distortion_coefficients"] >> distCoeffs;
-    return true;
+    return (camMatrix.size() == cv::Size(3,3)) ;
 }
 
 void createBoard()
@@ -161,4 +161,4 @@ int main(int argc, char* argv[])
         break;
     }
     return 0;
-}
+}

modules/face/src/facemarkLBF.cpp

@@ -332,9 +332,9 @@ void FacemarkLBFImpl::training(void* parameters){
         CV_Error(Error::StsBadArg, "Training data is not provided. Consider to add using addTrainingSample() function!");
     }
 
-    if (params.cascade_face.empty() || (params.model_filename.empty() && params.save_model))
+    if (params.model_filename.empty() && params.save_model)
     {
-        CV_Error(Error::StsBadArg, "The parameter cascade_face and model_filename should be set!");
+        CV_Error(Error::StsBadArg, "The parameter model_filename should be set!");
     }
 
     // flip the image and swap the landmark position
@@ -535,13 +535,14 @@ Rect FacemarkLBFImpl::getBBox(Mat &img, const Mat_<double> shape) {
 void FacemarkLBFImpl::prepareTrainingData(Mat img, std::vector<Point2f> facePoints,
     std::vector<Mat> & cropped, std::vector<Mat> & shapes, std::vector<BBox> &boxes)
 {
+    Mat shape;
+    Mat _shape = Mat(facePoints).reshape(1);
+    Rect box = getBBox(img, _shape);
+
     if(img.channels()>1){
         cvtColor(img,img,COLOR_BGR2GRAY);
     }
 
-    Mat shape;
-    Mat _shape = Mat(facePoints).reshape(1);
-    Rect box = getBBox(img, _shape);
     if(box.x != -1){
         _shape.convertTo(shape, CV_64FC1);
         Mat sx = shape.col(0);