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

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

parents 2dcd366c 6e96bb2c

modules/aruco/include/opencv2/aruco/charuco.hpp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ class CV_EXPORTS_W CharucoBoard : public Board { 
    // size of chessboard squares side (normally in meters)

    float _squareLength;



    // marker side lenght (normally in meters)

    // marker side length (normally in meters)

    float _markerLength;

};

modules/aruco/samples/detect_board.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ const char* about = "Pose estimation using a ArUco Planar Grid board"; 
const char* keys  =

        "{w        |       | Number of squares in X direction }"

        "{h        |       | Number of squares in Y direction }"

        "{l        |       | Marker side lenght (in pixels) }"

        "{l        |       | Marker side length (in pixels) }"

        "{s        |       | Separation between two consecutive markers in the grid (in pixels)}"

        "{d        |       | dictionary: DICT_4X4_50=0, DICT_4X4_100=1, DICT_4X4_250=2,"

        "DICT_4X4_1000=3, DICT_5X5_50=4, DICT_5X5_100=5, DICT_5X5_250=6, DICT_5X5_1000=7, "

modules/aruco/samples/detect_markers.cpp

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ const char* keys = 
        "{v        |       | Input from video file, if ommited, input comes from camera }"

        "{ci       | 0     | Camera id if input doesnt come from video (-v) }"

        "{c        |       | Camera intrinsic parameters. Needed for camera pose }"

        "{l        | 0.1   | Marker side lenght (in meters). Needed for correct scale in camera pose }"

        "{l        | 0.1   | Marker side length (in meters). Needed for correct scale in camera pose }"

        "{dp       |       | File of marker detector parameters }"

        "{r        |       | show rejected candidates too }"

        "{refine   |       | Corner refinement: CORNER_REFINE_NONE=0, CORNER_REFINE_SUBPIX=1,"

modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ A ```GridBoard``` object can be defined using the following parameters: 


- Number of markers in the X direction.

- Number of markers in the Y direction.

- Lenght of the marker side.

- Length of the marker side.

- Length of the marker separation.

- The dictionary of the markers.

- Ids of all the markers (X*Y markers).

modules/bioinspired/doc/retina.markdown

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ functions (C++, Java, Python) : 


      // Allocators

      cv::Ptr<Retina> Retina::create (Size inputSize);

      cv::Ptr<Retina> Retina::create (Size inputSize, const bool colorMode, RETINA_COLORSAMPLINGMETHOD colorSamplingMethod=RETINA_COLOR_BAYER, const bool useRetinaLogSampling=false, const double reductionFactor=1.0, const double samplingStrenght=10.0);

      cv::Ptr<Retina> Retina::create (Size inputSize, const bool colorMode, RETINA_COLORSAMPLINGMETHOD colorSamplingMethod=RETINA_COLOR_BAYER, const bool useRetinaLogSampling=false, const double reductionFactor=1.0, const double samplingStrength=10.0);

      }} // cv and bioinspired namespaces end

@endcode