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

2020-08-06 14:15:52 +00:00
parent dbab8d8c38 1067cd0649
commit fa25faa2d2
52 changed files with 1498 additions and 319 deletions
@@ -272,7 +272,7 @@ public:
    @param pano Final pano.
    @return Status code.
     */
-    Status composePanorama(InputArrayOfArrays images, OutputArray pano);
+    CV_WRAP Status composePanorama(InputArrayOfArrays images, OutputArray pano);

    /** @overload */
    CV_WRAP Status stitch(InputArrayOfArrays images, OutputArray pano);