opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 04:25:42 +08:00
Code Issues Releases Wiki Activity

fixing

Browse Source
This commit is contained in:
AleksandrPanov
2022-12-14 18:46:19 +03:00
parent 7b1f75121a
commit ef510ade2e
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/aruco/include/opencv2/aruco/charuco.hpp
View File

@@ -91,7 +91,7 @@ CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays mark
InputArray cameraMatrix = noArray(), InputArray cameraMatrix = noArray(),
InputArray distCoeffs = noArray(), InputArray distCoeffs = noArray(),
Ptr<Dictionary> dictionary = makePtr<Dictionary> Ptr<Dictionary> dictionary = makePtr<Dictionary>
(getPredefinedDictionary(PREDEFINED_DICTIONARY::DICT_4X4_50))); (getPredefinedDictionary(PredefinedDictionaryType::DICT_4X4_50)));

2
modules/aruco/samples/aruco_dict_utils.cpp
View File

@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/calibrate_camera.cpp
View File

@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/calibrate_camera_charuco.cpp
View File

@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/create_board.cpp
View File

@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/create_board_charuco.cpp
View File

@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/create_diamond.cpp
View File

@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
return 0; return 0;
} }
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
istringstream ss(idsString); istringstream ss(idsString);
vector< string > splittedIds; vector< string > splittedIds;

2
modules/aruco/samples/create_marker.cpp
View File

@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/detect_board.cpp
View File

@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/detect_board_charuco.cpp
View File

@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/detect_diamonds.cpp
View File

@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

2
modules/aruco/samples/detect_markers.cpp
View File

@@ -111,7 +111,7 @@ int main(int argc, char *argv[]) {
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
if (parser.has("d")) { if (parser.has("d")) {
int dictionaryId = parser.get<int>("d"); int dictionaryId = parser.get<int>("d");
dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
} }
else if (parser.has("cd")) { else if (parser.has("cd")) {
FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ); FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);

4
modules/aruco/test/test_charucodetection.cpp
View File

@@ -548,7 +548,7 @@ TEST(Charuco, testCharucoCornersCollinear_true)
Ptr<aruco::DetectorParameters> detectorParams = makePtr<aruco::DetectorParameters>(); Ptr<aruco::DetectorParameters> detectorParams = makePtr<aruco::DetectorParameters>();
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
Ptr<aruco::CharucoBoard> charucoBoard = Ptr<aruco::CharucoBoard> charucoBoard =
aruco::CharucoBoard::create(squaresX, squaresY, squareLength, markerLength, dictionary); aruco::CharucoBoard::create(squaresX, squaresY, squareLength, markerLength, dictionary);
@@ -589,7 +589,7 @@ TEST(Charuco, testCharucoCornersCollinear_false)
Ptr<aruco::DetectorParameters> detectorParams = makePtr<aruco::DetectorParameters>(); Ptr<aruco::DetectorParameters> detectorParams = makePtr<aruco::DetectorParameters>();
aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId)); aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
Ptr<aruco::CharucoBoard> charucoBoard = Ptr<aruco::CharucoBoard> charucoBoard =
aruco::CharucoBoard::create(squaresX, squaresY, squareLength, markerLength, dictionary); aruco::CharucoBoard::create(squaresX, squaresY, squareLength, markerLength, dictionary);

2
modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
View File

@@ -404,7 +404,7 @@ From all the provided dictionaries, it is recommended to choose the smallest one
For instance, if you need 200 markers of 6x6 bits, it is better to use `DICT_6X6_250` than `DICT_6X6_1000`. For instance, if you need 200 markers of 6x6 bits, it is better to use `DICT_6X6_250` than `DICT_6X6_1000`.
The smaller the dictionary, the higher the inter-marker distance. The smaller the dictionary, the higher the inter-marker distance.
The list of available predefined dictionaries can be found in the documentation for the `PREDEFINED_DICTIONARY` enum. The list of available predefined dictionaries can be found in the documentation for the `PredefinedDictionaryType` enum.
### Automatic dictionary generation ### Automatic dictionary generation