Fixed warper selection bug in stitching_detailed. Removed estimation of aspect ratio in BA in stitching to avoid stretching of input images. Did minor refactoring.
This commit is contained in:
@@ -80,15 +80,11 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class CV_EXPORTS BundleAdjuster : public Estimator
|
||||
// Minimizes reprojection error
|
||||
class CV_EXPORTS BundleAdjusterReproj : public Estimator
|
||||
{
|
||||
public:
|
||||
enum { NO, RAY_SPACE, FOCAL_RAY_SPACE };
|
||||
|
||||
BundleAdjuster(int cost_space = FOCAL_RAY_SPACE, float conf_thresh = 1.f)
|
||||
: cost_space_(cost_space), conf_thresh_(conf_thresh) {}
|
||||
|
||||
Mat K;
|
||||
BundleAdjusterReproj(float conf_thresh = 1.f) : conf_thresh_(conf_thresh) {}
|
||||
|
||||
private:
|
||||
void estimate(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches,
|
||||
@@ -104,7 +100,6 @@ private:
|
||||
Mat cameras_;
|
||||
std::vector<std::pair<int,int> > edges_;
|
||||
|
||||
int cost_space_;
|
||||
float conf_thresh_;
|
||||
Mat err_, err1_, err2_;
|
||||
Mat J_;
|
||||
|
Reference in New Issue
Block a user