Added support of vertical straightening into stitching

modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp

@@ -170,7 +170,13 @@ private:
 };
 
 
-void CV_EXPORTS waveCorrect(std::vector<Mat> &rmats);
+enum CV_EXPORTS WaveCorrectKind
+{
+    WAVE_CORRECT_HORIZ,
+    WAVE_CORRECT_VERT
+};
+
+void CV_EXPORTS waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind);
 
 
 //////////////////////////////////////////////////////////////////////////////

modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp

@@ -100,6 +100,7 @@ public:
               std::vector<Mat> &masks);
 
 private:
+    // To avoid GCGraph dependency
     class Impl;
     Ptr<Impl> impl_;
 };

modules/stitching/include/opencv2/stitching/detail/warpers.hpp

@@ -129,6 +129,7 @@ protected:
     void detectResultRoi(Point &dst_tl, Point &dst_br);
 };
 
+
 #ifndef ANDROID
 class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
 {

modules/stitching/include/opencv2/stitching/stitcher.hpp

@@ -96,6 +96,9 @@ public:
     void setBundleAdjuster(Ptr<detail::BundleAdjusterBase> bundle_adjuster)
         { bundle_adjuster_ = bundle_adjuster; }
 
+    detail::WaveCorrectKind waveCorrectKind() const { return wave_correct_kind_; }
+    void setWaveCorrectKind(detail::WaveCorrectKind kind) { wave_correct_kind_ = kind; }
+
     Ptr<WarperCreator> warper() { return warper_; }
     const Ptr<WarperCreator> warper() const { return warper_; }
     void setWarper(Ptr<WarperCreator> warper) { warper_ = warper; }
@@ -124,6 +127,7 @@ private:
     Ptr<detail::FeaturesFinder> features_finder_;
     Ptr<detail::FeaturesMatcher> features_matcher_;
     Ptr<detail::BundleAdjusterBase> bundle_adjuster_;
+    detail::WaveCorrectKind wave_correct_kind_;
     Ptr<WarperCreator> warper_;
     Ptr<detail::ExposureCompensator> exposure_comp_;
     Ptr<detail::SeamFinder> seam_finder_;