diff --git a/apps/interactive-calibration/calibCommon.hpp b/apps/interactive-calibration/calibCommon.hpp index 6acf610897..f422ff0531 100644 --- a/apps/interactive-calibration/calibCommon.hpp +++ b/apps/interactive-calibration/calibCommon.hpp @@ -80,7 +80,7 @@ namespace calib cv::Size boardSize; int charucoDictName; int calibrationStep; - float charucoSquareLenght, charucoMarkerSize; + float charucoSquareLength, charucoMarkerSize; float captureDelay; float squareSize; float templDst; diff --git a/apps/interactive-calibration/defaultConfig.xml b/apps/interactive-calibration/defaultConfig.xml index d14ba865d3..cad201fba1 100644 --- a/apps/interactive-calibration/defaultConfig.xml +++ b/apps/interactive-calibration/defaultConfig.xml @@ -1,7 +1,7 @@ 0 -200 +200 100 1 30 diff --git a/apps/interactive-calibration/frameProcessor.cpp b/apps/interactive-calibration/frameProcessor.cpp index 9d78271438..251285e045 100644 --- a/apps/interactive-calibration/frameProcessor.cpp +++ b/apps/interactive-calibration/frameProcessor.cpp @@ -273,7 +273,7 @@ CalibProcessor::CalibProcessor(cv::Ptr data, captureParameters #ifdef HAVE_OPENCV_ARUCO mArucoDictionary = cv::aruco::getPredefinedDictionary( cv::aruco::PREDEFINED_DICTIONARY_NAME(capParams.charucoDictName)); - mCharucoBoard = cv::aruco::CharucoBoard::create(mBoardSize.width, mBoardSize.height, capParams.charucoSquareLenght, + mCharucoBoard = cv::aruco::CharucoBoard::create(mBoardSize.width, mBoardSize.height, capParams.charucoSquareLength, capParams.charucoMarkerSize, mArucoDictionary); #endif break; diff --git a/apps/interactive-calibration/main.cpp b/apps/interactive-calibration/main.cpp index f3d1e5d66b..6468c88ce7 100644 --- a/apps/interactive-calibration/main.cpp +++ b/apps/interactive-calibration/main.cpp @@ -181,7 +181,7 @@ int main(int argc, char** argv) cv::aruco::getPredefinedDictionary(cv::aruco::PREDEFINED_DICTIONARY_NAME(capParams.charucoDictName)); cv::Ptr charucoboard = cv::aruco::CharucoBoard::create(capParams.boardSize.width, capParams.boardSize.height, - capParams.charucoSquareLenght, capParams.charucoMarkerSize, dictionary); + capParams.charucoSquareLength, capParams.charucoMarkerSize, dictionary); globalData->totalAvgErr = cv::aruco::calibrateCameraCharuco(globalData->allCharucoCorners, globalData->allCharucoIds, charucoboard, globalData->imageSize, diff --git a/apps/interactive-calibration/parametersController.cpp b/apps/interactive-calibration/parametersController.cpp index 8b44ba0409..c76b915c63 100644 --- a/apps/interactive-calibration/parametersController.cpp +++ b/apps/interactive-calibration/parametersController.cpp @@ -37,7 +37,10 @@ bool calib::parametersController::loadFromFile(const std::string &inputFileName) } readFromNode(reader["charuco_dict"], mCapParams.charucoDictName); - readFromNode(reader["charuco_square_lenght"], mCapParams.charucoSquareLenght); + if (readFromNode(reader["charuco_square_lenght"], mCapParams.charucoSquareLength)) { + std::cout << "DEPRECATION: Parameter 'charuco_square_lenght' has been deprecated (typo). Use 'charuco_square_length' instead." << std::endl; + } + readFromNode(reader["charuco_square_length"], mCapParams.charucoSquareLength); readFromNode(reader["charuco_marker_size"], mCapParams.charucoMarkerSize); readFromNode(reader["camera_resolution"], mCapParams.cameraResolution); readFromNode(reader["calibration_step"], mCapParams.calibrationStep); @@ -51,7 +54,7 @@ bool calib::parametersController::loadFromFile(const std::string &inputFileName) bool retValue = checkAssertion(mCapParams.charucoDictName >= 0, "Dict name must be >= 0") && checkAssertion(mCapParams.charucoMarkerSize > 0, "Marker size must be positive") && - checkAssertion(mCapParams.charucoSquareLenght > 0, "Square size must be positive") && + checkAssertion(mCapParams.charucoSquareLength > 0, "Square size must be positive") && checkAssertion(mCapParams.minFramesNum > 1, "Minimal number of frames for calibration < 1") && checkAssertion(mCapParams.calibrationStep > 0, "Calibration step must be positive") && checkAssertion(mCapParams.maxFramesNum > mCapParams.minFramesNum, "maxFramesNum < minFramesNum") && @@ -119,7 +122,7 @@ bool calib::parametersController::loadFromParser(cv::CommandLineParser &parser) mCapParams.board = chAruco; mCapParams.boardSize = cv::Size(6, 8); mCapParams.charucoDictName = 0; - mCapParams.charucoSquareLenght = 200; + mCapParams.charucoSquareLength = 200; mCapParams.charucoMarkerSize = 100; } else { diff --git a/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown b/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown index 0c4d67ec85..8280262cdd 100644 --- a/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown +++ b/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown @@ -64,7 +64,7 @@ By default values of advanced parameters are stored in defaultConfig.xml 0 -200 +200 100 1 30 @@ -78,7 +78,7 @@ By default values of advanced parameters are stored in defaultConfig.xml @endcode - *charuco_dict*: name of special dictionary, which has been used for generation of chAruco pattern -- *charuco_square_lenght*: size of square on chAruco board (in pixels) +- *charuco_square_length*: size of square on chAruco board (in pixels) - *charuco_marker_size*: size of Aruco markers on chAruco board (in pixels) - *calibration_step*: interval in frames between launches of @ref cv::calibrateCamera - *max_frames_num*: if number of frames for calibration is greater then this value frames filter starts working. @@ -91,7 +91,7 @@ QR faster than SVD, but potentially less precise - *frame_filter_conv_param*: parameter which used in linear convolution of bicriterial frames filter - *camera_resolution*: resolution of camera which is used for calibration -**Note:** *charuco_dict*, *charuco_square_lenght* and *charuco_marker_size* are used for chAruco pattern generation +**Note:** *charuco_dict*, *charuco_square_length* and *charuco_marker_size* are used for chAruco pattern generation (see Aruco module description for details: [Aruco tutorials](https://github.com/opencv/opencv_contrib/tree/master/modules/aruco/tutorials)) Default chAruco pattern: diff --git a/modules/core/src/persistence_yml.cpp b/modules/core/src/persistence_yml.cpp index f4cc6e4a40..713da33c50 100644 --- a/modules/core/src/persistence_yml.cpp +++ b/modules/core/src/persistence_yml.cpp @@ -201,20 +201,20 @@ icvYMLParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node, if ( d == '<') //support of full type heading from YAML 1.2 { const char* yamlTypeHeading = "' && (size_t)(typeEndPtr - ptr) > headingLenght ) + if ( d == '>' && (size_t)(typeEndPtr - ptr) > headingLength ) { - if ( memcmp(ptr, yamlTypeHeading, headingLenght) == 0 ) + if ( memcmp(ptr, yamlTypeHeading, headingLength) == 0 ) { value_type |= CV_NODE_USER; *typeEndPtr = ' '; - ptr += headingLenght - 1; + ptr += headingLength - 1; } } } diff --git a/samples/cpp/falsecolor.cpp b/samples/cpp/falsecolor.cpp index ed422b39c1..f73ffad4ce 100644 --- a/samples/cpp/falsecolor.cpp +++ b/samples/cpp/falsecolor.cpp @@ -41,10 +41,10 @@ static Mat DrawMyImage(int thickness,int nbShape) { Mat img=Mat::zeros(500,256*thickness+100,CV_8UC1); int offsetx = 50, offsety = 25; - int lineLenght = 50; + int lineLength = 50; for (int i=0;i<256;i++) - line(img,Point(thickness*i+ offsetx, offsety),Point(thickness*i+ offsetx, offsety+ lineLenght),Scalar(i), thickness); + line(img,Point(thickness*i+ offsetx, offsety),Point(thickness*i+ offsetx, offsety+ lineLength),Scalar(i), thickness); RNG r; Point center; int radius; @@ -57,19 +57,19 @@ static Mat DrawMyImage(int thickness,int nbShape) int typeShape = r.uniform(MyCIRCLE, MyELLIPSE+1); switch (typeShape) { case MyCIRCLE: - center = Point(r.uniform(offsetx,img.cols- offsetx), r.uniform(offsety + lineLenght, img.rows - offsety)); + center = Point(r.uniform(offsetx,img.cols- offsetx), r.uniform(offsety + lineLength, img.rows - offsety)); radius = r.uniform(1, min(offsetx, offsety)); circle(img,center,radius,Scalar(i),-1); break; case MyRECTANGLE: - center = Point(r.uniform(offsetx, img.cols - offsetx), r.uniform(offsety + lineLenght, img.rows - offsety)); + center = Point(r.uniform(offsetx, img.cols - offsetx), r.uniform(offsety + lineLength, img.rows - offsety)); width = r.uniform(1, min(offsetx, offsety)); height = r.uniform(1, min(offsetx, offsety)); rc = Rect(center-Point(width ,height )/2, center + Point(width , height )/2); rectangle(img,rc, Scalar(i), -1); break; case MyELLIPSE: - center = Point(r.uniform(offsetx, img.cols - offsetx), r.uniform(offsety + lineLenght, img.rows - offsety)); + center = Point(r.uniform(offsetx, img.cols - offsetx), r.uniform(offsety + lineLength, img.rows - offsety)); width = r.uniform(1, min(offsetx, offsety)); height = r.uniform(1, min(offsetx, offsety)); angle = r.uniform(0, 180);