1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2024-08-27 18:31:36 +03:00
108 changed files with 1241 additions and 646 deletions
+2 -1
View File
@@ -1035,7 +1035,8 @@ static std::string findData(const std::string& relative_path, bool required, boo
}
}
#ifdef OPENCV_TEST_DATA_INSTALL_PATH
datapath = path_join("./", OPENCV_TEST_DATA_INSTALL_PATH);
datapath = OPENCV_TEST_DATA_INSTALL_PATH;
if (isDirectory(datapath))
{
for(size_t i = search_subdir.size(); i > 0; i--)