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

2026-07-29 23:33:05 +04:00 · 2023-01-21 18:19:39 +00:00
parent 3085fc6345 b71a168937
commit 18cbfa4a4f
74 changed files with 249 additions and 228 deletions
@@ -138,7 +138,7 @@ int CV_DetectorTest::prepareData( FileStorage& _fs )
                String filename;
                it >> filename;
                imageFilenames.push_back(filename);
-                Mat img = imread( dataPath+filename, 1 );
+                Mat img = imread( dataPath+filename, IMREAD_COLOR );
                images.push_back( img );
            }
        }