Clear old CameraParameters in AffineBasedEstimator

superbort · superbort · commit b2524f45717b · 2017-03-28T15:19:25.000+02:00
AffineBasedEstimator crashed when called with an existing CameraParameters.
This happens e.g. when using Stitcher in SCANS mode.
CameraraParameters is now cleared before any calculation is executed.
diff --git a/modules/stitching/src/motion_estimators.cpp b/modules/stitching/src/motion_estimators.cpp
@@ -199,7 +199,7 @@ bool AffineBasedEstimator::estimate(const std::vector<ImageFeatures> &features,
                                     const std::vector<MatchesInfo> &pairwise_matches,
                                     std::vector<CameraParams> &cameras)
 {
-    cameras.resize(features.size());
+    cameras.assign(features.size(), CameraParams());
     const int num_images = static_cast<int>(features.size());
 
     // find maximum spaning tree on pairwise matches

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ bool AffineBasedEstimator::estimate(const std::vector<ImageFeatures> &features,`
`199`	`199`	`const std::vector<MatchesInfo> &pairwise_matches,`
`200`	`200`	`std::vector<CameraParams> &cameras)`
`201`	`201`	`{`
`202`		`- cameras.resize(features.size());`
	`202`	`+ cameras.assign(features.size(), CameraParams());`
`203`	`203`	`const int num_images = static_cast<int>(features.size());`
`204`	`204`
`205`	`205`	`// find maximum spaning tree on pairwise matches`