Commit d01edbd6 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files

Merge pull request #2375 from alalek:backport_contrib_2369

parents a89f104d 078c4563

modules/aruco/include/opencv2/aruco.hpp

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ class CV_EXPORTS_W GridBoard : public Board { 
    // number of markers in X and Y directions

    int _markersX, _markersY;



    // marker side lenght (normally in meters)

    // marker side length (normally in meters)

    float _markerLength;



    // separation between markers in the grid

modules/aruco/src/apriltag_quad_thresh.cpp

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ int fit_quad(const Ptr<DetectorParameters> &_params, const Mat im, zarray_t *clu 
    if (dot < 0)

        return 0;



    // we now sort the points according to theta. This is a prepatory

    // we now sort the points according to theta. This is a preparatory

    // step for segmenting them into four lines.

    if (1) {

        //        zarray_sort(cluster, pt_compare_theta);

modules/aruco/src/charuco.cpp

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ void drawDetectedCornersCharuco(InputOutputArray _image, InputArray _charucoCorn 


/**

  * Check if a set of 3d points are enough for calibration. Z coordinate is ignored.

  * Only axis paralel lines are considered

  * Only axis parallel lines are considered

  */

static bool _arePointsEnoughForPoseEstimation(const vector< Point3f > &points) {

modules/aruco/src/dictionary.cpp

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ bool Dictionary::identify(const Mat &onlyBits, int &idx, int &rotation, 
            }

        }



        // if maxCorrection is fullfilled, return this one

        // if maxCorrection is fulfilled, return this one

        if(currentMinDistance <= maxCorrectionRecalculed) {

            idx = m;

            rotation = currentRotation;

modules/aruco/tutorials/charuco_detection/charuco_detection.markdown

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ This class, as the rest of ChArUco functionalities, are defined in: 
    #include <opencv2/aruco/charuco.hpp>

@endcode



To define a ```CharucoBoard```, it is necesary:

To define a ```CharucoBoard```, it is necessary:



- Number of chessboard squares in X direction.

- Number of chessboard squares in Y direction.