Merge branch 4.x

2026-09-12 13:23:03 -05:00 · 2025-02-05 09:28:27 +03:00
parent 6223bdbf7b 342ced1e04
commit 55a2ca58f0
180 changed files with 11419 additions and 1819 deletions
--- a/modules/features/test/test_matchers_algorithmic.cpp
+++ b/modules/features/test/test_matchers_algorithmic.cpp
@@ -43,9 +43,6 @@

 namespace opencv_test { namespace {

-const string FEATURES2D_DIR = "features2d";
-const string IMAGE_FILENAME = "tsukuba.png";
-
 /****************************************************************************************\
 *                       Algorithmic tests for descriptor matchers                        *
 \****************************************************************************************/