Merge pull request #4092 from asmorkalov:5.x-merge-4.x

Port OpenCV 28309: Typo fixes in G-API

Author: asmorkalov

modules/gapi/include/opencv2/gapi/video.hpp

@@ -355,7 +355,7 @@ template<> struct CompileArgTag<cv::gapi::video::BackgroundSubtractorParams>
 {
     static const char* tag()
     {
-        return "org.opencv.video.background_substractor_params";
+        return "org.opencv.video.background_subtractor_params";
     }
 };
 }  // namespace detail

modules/gapi/src/executor/gstreamingexecutor.cpp

@@ -337,7 +337,7 @@ void rewindToStop(std::vector<Q*> &in_queues,
     });
 
     if (expected_stop_count > 0) {
-        // NB: it requires to substract own queues id from total waiting queue count
+        // NB: it requires to subtract own queues id from total waiting queue count
         // because it had got stop message before rewind was called
         expected_stop_count--;
     }

modules/gapi/test/common/gapi_video_tests_common.hpp

@@ -381,7 +381,7 @@ inline void testBackgroundSubtractorStreaming(cv::GStreamingCompiled& gapiBackSu
 
     compare_f cmpF = AbsSimilarPoints(tolerance, numDiff).to_compare_f();
 
-    // Comparison of G-API and OpenCV substractors
+    // Comparison of G-API and OpenCV subtractors
     std::size_t frames = 0u;
     while (frames <= testNumFrames && gapiBackSub.pull(cv::gout(frame, gapiForeground)))
     {

modules/gapi/test/cpu/gapi_ocv_stateful_kernel_tests.cpp

@@ -37,7 +37,7 @@ namespace cv
         {
             static const char* tag()
             {
-                return "org.opencv.test.background_substractor_state_params";
+                return "org.opencv.test.background_subtractor_state_params";
             }
         };
 
@@ -115,7 +115,7 @@ namespace
         }
     };
 
-    G_TYPED_KERNEL(GBackSub, <GMat(GMat)>, "org.opencv.test.background_substractor")
+    G_TYPED_KERNEL(GBackSub, <GMat(GMat)>, "org.opencv.test.background_subtractor")
     {
          static GMatDesc outMeta(GMatDesc in) { return in.withType(CV_8U, 1); }
     };
@@ -438,10 +438,10 @@ namespace
         gapiBackSub.start();
         EXPECT_TRUE(gapiBackSub.running());
 
-        // OpenCV reference substractor
+        // OpenCV reference subtractor
         auto pOCVBackSub = createBackgroundSubtractorKNN();
 
-        // Comparison of G-API and OpenCV substractors
+        // Comparison of G-API and OpenCV subtractors
         std::size_t frames = 0u;
         while (gapiBackSub.pull(cv::gout(frame, gapiForeground))) {
             pOCVBackSub->apply(frame, ocvForeground, -1);
@@ -503,7 +503,7 @@ TEST(StatefulKernel, StateIsChangedViaCompArgsOnReshape)
 
     const auto pkg = cv::gapi::kernels<GOCVBackSub>();
 
-    // OpenCV reference substractor
+    // OpenCV reference subtractor
     auto pOCVBackSubKNN = createBackgroundSubtractorKNN();
     auto pOCVBackSubMOG2 = createBackgroundSubtractorMOG2();