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

2023-01-21 18:19:39 +00:00
parent 3085fc6345 b71a168937
commit 18cbfa4a4f
74 changed files with 249 additions and 228 deletions
@@ -63,7 +63,7 @@ Making a project
    int main( int argc, char** argv )
    {
      Mat image;
-      image = imread( argv[1], 1 );
+      image = imread( argv[1], IMREAD_COLOR );

      if( argc != 2 || !image.data )
        {