Skip to content

Replace FLANNException by CV_Error.#18604

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
vrabaud:master
Dec 20, 2020
Merged

Replace FLANNException by CV_Error.#18604
opencv-pushbot merged 1 commit intoopencv:3.4from
vrabaud:master

Conversation

@vrabaud
Copy link
Copy Markdown
Contributor

@vrabaud vrabaud commented Oct 17, 2020 •
edited
Loading

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 other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • The feature is well documented and sample code can be built with the project CMake

@vrabaud
Copy link
Copy Markdown
Contributor Author

vrabaud commented Oct 17, 2020

This is to not throw error when setBreakOnError has been called.

@vrabaud vrabaud closed this Oct 18, 2020
@vrabaud
Copy link
Copy Markdown
Contributor Author

vrabaud commented Oct 18, 2020

I will wait for master to become OpenCV 5.

@vrabaud vrabaud mentioned this pull request Oct 20, 2020
Open
@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 23, 2020

@vrabaud It is fine to reopen PR and restore FLANNException class under #if CV_VERSION_MAJOR == 4 guard to make ABI checker happy.

@vrabaud vrabaud reopened this Dec 16, 2020
@vrabaud vrabaud changed the base branch from master to 3.4 December 17, 2020 08:40
@vrabaud
Copy link
Copy Markdown
Contributor Author

vrabaud commented Dec 20, 2020

@alalek , I have re-opened the branch and set it to the 3.4 branch but the builds have not triggered for 3 days, what should I do ? Thx

@alalek
Copy link
Copy Markdown
Member

alalek commented Dec 20, 2020

from vrabaud:master
but the builds have not triggered for 3 days, what should I do

Need to use proper descriptive branch names for source branch. master / 3.4 / etc source branches can't be automatically tested (especially in multi-repository cases with_opencv_extra/contrib).
Builds for such PRs are scheduled manually by reviewers/maintainers.

alalek
alalek approved these changes Dec 20, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@opencv-pushbot opencv-pushbot merged commit c84d2cb into opencv:3.4 Dec 20, 2020
@alalek alalek mentioned this pull request Dec 20, 2020
Merged
@alalek alalek mentioned this pull request Apr 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install category: flann

Projects

None yet

Milestone

3.4.13

Development

Successfully merging this pull request may close these issues.

3 participants

@vrabaud @alalek @opencv-pushbot