Merge pull request #10681 An error occurred from hmaarrfk:python_stitching_scans

modules/stitching/include/opencv2/stitching.hpp

@@ -312,6 +312,7 @@ private:
 };
 
 CV_EXPORTS_W Ptr<Stitcher> createStitcher(bool try_use_gpu = false);
+CV_EXPORTS_W Ptr<Stitcher> createStitcherScans(bool try_use_gpu = false);
 
 //! @} stitching
 

modules/stitching/src/stitcher.cpp

@@ -606,42 +606,13 @@ Ptr<Stitcher> createStitcher(bool try_use_gpu)
 {
     CV_INSTRUMENT_REGION()
 
-    Ptr<Stitcher> stitcher = makePtr<Stitcher>();
-    stitcher->setRegistrationResol(0.6);
-    stitcher->setSeamEstimationResol(0.1);
-    stitcher->setCompositingResol(Stitcher::ORIG_RESOL);
-    stitcher->setPanoConfidenceThresh(1);
-    stitcher->setWaveCorrection(true);
-    stitcher->setWaveCorrectKind(detail::WAVE_CORRECT_HORIZ);
-    stitcher->setFeaturesMatcher(makePtr<detail::BestOf2NearestMatcher>(try_use_gpu));
-    stitcher->setBundleAdjuster(makePtr<detail::BundleAdjusterRay>());
-
-    #ifdef HAVE_OPENCV_CUDALEGACY
-    if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
-    {
-        #ifdef HAVE_OPENCV_NONFREE
-        stitcher->setFeaturesFinder(makePtr<detail::SurfFeaturesFinderGpu>());
-        #else
-        stitcher->setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
-        #endif
-        stitcher->setWarper(makePtr<SphericalWarperGpu>());
-        stitcher->setSeamFinder(makePtr<detail::GraphCutSeamFinderGpu>());
-    }
-    else
-    #endif
-    {
-        #ifdef HAVE_OPENCV_NONFREE
-        stitcher->setFeaturesFinder(makePtr<detail::SurfFeaturesFinder>());
-        #else
-        stitcher->setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
-        #endif
-        stitcher->setWarper(makePtr<SphericalWarper>());
-        stitcher->setSeamFinder(makePtr<detail::GraphCutSeamFinder>(detail::GraphCutSeamFinderBase::COST_COLOR));
-    }
+    return Stitcher::create(Stitcher::PANORAMA, try_use_gpu);
+}
 
-    stitcher->setExposureCompensator(makePtr<detail::BlocksGainCompensator>());
-    stitcher->setBlender(makePtr<detail::MultiBandBlender>(try_use_gpu));
+Ptr<Stitcher> createStitcherScans(bool try_use_gpu)
+{
+    CV_INSTRUMENT_REGION()
 
-    return stitcher;
+    return Stitcher::create(Stitcher::SCANS, try_use_gpu);
 }
 } // namespace cv