Skip to content

Merge usac to 5.x#24005

Merged
asmorkalov merged 4 commits intoopencv:5.xfrom
ivashmak:merge_usac_5.x
Jul 27, 2023
Merged

Merge usac to 5.x#24005
asmorkalov merged 4 commits intoopencv:5.xfrom
ivashmak:merge_usac_5.x

Conversation

@ivashmak
Copy link
Copy Markdown
Contributor

@ivashmak ivashmak commented Jul 17, 2023

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

Base branch is PR #23979. Merging PR #23078 and PR #23806 to 5.x

};
class PnPSVDSolver : public MinimalSolver {
public:
static Ptr<PnPSVDSolver> create (const Mat &points);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's new.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is PnPSVDSolver in 4.x, it's just on another line:
https://github.com/opencv/opencv/blob/4.x/modules/calib3d/src/usac.hpp#L97

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use the same file structure and not swap classes to reduce merge conflicts.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed this by moving all new stuff created in 5.x to the end of the file.

// return maximum number of possible solutions of non-minimal estimation.
virtual int getMaxNumSolutionsNonMinimal () const = 0;
virtual Ptr<Estimator> clone() const = 0;
virtual void enforceRankConstraint (bool enforce) = 0;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EssentialEstimator changes are missing.

@asmorkalov asmorkalov self-assigned this Jul 18, 2023
@asmorkalov asmorkalov added this to the 5.0 milestone Jul 19, 2023
@asmorkalov asmorkalov merged commit 0e87487 into opencv:5.x Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants