Merge branch 4.x

modules/calib/include/opencv2/calib.hpp

@@ -580,7 +580,7 @@ CV_EXPORTS_W Mat initCameraMatrix2D( InputArrayOfArrays objectPoints,
 
 @param image Source chessboard view. It must be an 8-bit grayscale or color image.
 @param patternSize Number of inner corners per a chessboard row and column
-( patternSize = cv::Size(points_per_row,points_per_colum) = cv::Size(columns,rows) ).
+( patternSize = cv::Size(points_per_row,points_per_column) = cv::Size(columns,rows) ).
 @param corners Output array of detected corners.
 @param flags Various operation flags that can be zero or a combination of the following values:
 -   @ref CALIB_CB_ADAPTIVE_THRESH Use adaptive thresholding to convert the image to black
@@ -645,7 +645,7 @@ CV_EXPORTS_W bool checkChessboard(InputArray img, Size size);
 
 @param image Source chessboard view. It must be an 8-bit grayscale or color image.
 @param patternSize Number of inner corners per a chessboard row and column
-( patternSize = cv::Size(points_per_row,points_per_colum) = cv::Size(columns,rows) ).
+( patternSize = cv::Size(points_per_row,points_per_column) = cv::Size(columns,rows) ).
 @param corners Output array of detected corners.
 @param flags Various operation flags that can be zero or a combination of the following values:
 -   @ref CALIB_CB_NORMALIZE_IMAGE Normalize the image gamma with equalizeHist before detection.
@@ -788,7 +788,7 @@ typedef CirclesGridFinderParameters CirclesGridFinderParameters2;
 
 @param image grid view of input circles; it must be an 8-bit grayscale or color image.
 @param patternSize number of circles per row and column
-( patternSize = Size(points_per_row, points_per_colum) ).
+( patternSize = Size(points_per_row, points_per_column) ).
 @param centers output array of detected centers.
 @param flags various operation flags that can be one of the following values:
 -   @ref CALIB_CB_SYMMETRIC_GRID uses symmetric pattern of circles.

modules/calib/src/calibinit.cpp

@@ -670,7 +670,7 @@ bool findChessboardCorners(InputArray image_, Size pattern_size,
     std::vector<Point2f> out_corners;
 
     if (is_plain)
-      CV_CheckType(type, depth == CV_8U && cn == 1, "Only 8-bit grayscale images are supported whith CALIB_CB_PLAIN flag enable");
+      CV_CheckType(type, depth == CV_8U && cn == 1, "Only 8-bit grayscale images are supported with CALIB_CB_PLAIN flag enable");
 
     if (img.channels() != 1)
     {

modules/calib/src/chessboard.cpp

@@ -725,7 +725,7 @@ void FastX::detectImpl(const cv::Mat& _gray_image,
             // calc images
             // for each angle step
             int scale_id = scale-parameters.min_scale;
-            int scale_size = int(pow(2.0,scale+1+super_res));
+            int scale_size = int(std::pow(2,scale+1+super_res));
             int scale_size2 = int((scale_size/7)*2+1);
             std::vector<cv::UMat> images;
             images.resize(2*num);
@@ -2242,7 +2242,7 @@ int Chessboard::Board::detectMarkers(cv::InputArray image)
             cv::bitwise_and(field,mask2,temp);
             double noise= cv::sum(temp)[0]/noise_size;
 
-            // calc refrence value
+            // calc reference value
             Cell *cell2 = getCell(y,abs(x-1));
             src[0] = *cell2->top_left;
             src[1] = *cell2->top_right;

modules/calib/test/test_cameracalibration.cpp

@@ -627,7 +627,7 @@ void CV_CameraCalibrationTest::run( int start_from )
         if( code < 0 )
             break;
 
-        /* ----- Compare rot matrixs ----- */
+        /* ----- Compare rot matrices ----- */
         CV_Assert(rotMatrs.size() == (size_t)numImages);
         CV_Assert(transVects.size() == (size_t)numImages);
 
@@ -647,7 +647,7 @@ void CV_CameraCalibrationTest::run( int start_from )
         if( code < 0 )
             break;
 
-        /* ----- Compare rot matrixs ----- */
+        /* ----- Compare rot matrices ----- */
         code = compare(transVects[0].val, goodTransVects[0].val, 3*numImages, 0.1, "translation vectors");
         if( code < 0 )
             break;