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

2026-01-15 12:15:17 +00:00 · 2020-11-20 19:35:32 +00:00
parent 049b50d9c0 2255973b0f
commit 0105f8fa38
16 changed files with 1337 additions and 132 deletions
--- a/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp
+++ b/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp
@@ -25,6 +25,7 @@ int const max_kernel_size = 21;
 void Erosion( int, void* );
 void Dilation( int, void* );

+//![main]
 /**
 * @function main
 */
@@ -70,6 +71,7 @@ int main( int argc, char** argv )
  waitKey(0);
  return 0;
 }
+//![main]

 //![erosion]
 /**