Skip to content

move aruco from contrib to objdetect in main repository #3325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

AleksandrPanov
Copy link
Contributor

@AleksandrPanov AleksandrPanov commented Aug 12, 2022

  1. Move aruco_detector, aruco_board, aruco_dictionary, aruco_utils to objdetect
  2. Reduce inludes
  3. Fix java tests (add objdetect import)
  4. Refactoring
  5. Reduce aruco pose estimate to fix refineDetectedMarkers

merge with opencv/opencv#22368

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

@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 5 times, most recently from 78fe8ac to 1fc06f9 Compare August 24, 2022 06:04
@AleksandrPanov AleksandrPanov marked this pull request as ready for review August 24, 2022 08:00
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 3 times, most recently from 78e66a7 to b407cf8 Compare August 26, 2022 11:57
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 4 times, most recently from ba5a77f to 0bbb7d2 Compare September 13, 2022 23:50
Copy link
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

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

👍

@stefan523
Copy link

Is there any chance to merge this with pull request "#3305" / issue "#3291"?

@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 4 times, most recently from 2da1ee3 to 801229c Compare October 5, 2022 21:59
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from 801229c to 4d96b1f Compare October 10, 2022 23:04
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 9 times, most recently from e477da5 to f15b0b7 Compare November 2, 2022 05:25
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 3 times, most recently from 210dd99 to b1af7a0 Compare November 28, 2022 10:46
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from b1af7a0 to 52c0566 Compare November 28, 2022 20:41
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from 9cd3be2 to dddc5d7 Compare December 6, 2022 10:30
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from dddc5d7 to 38b0a77 Compare December 6, 2022 11:01
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from 2174e9b to 6001973 Compare December 8, 2022 20:41
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from 6001973 to e28f18c Compare December 8, 2022 21:11
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch 3 times, most recently from 81753ec to e9b7e12 Compare December 13, 2022 19:35
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from e9b7e12 to 7b1f751 Compare December 13, 2022 19:46
@AleksandrPanov AleksandrPanov force-pushed the move_contrib_aruco_to_main_objdetect branch from eb231ea to ef510ad Compare December 14, 2022 15:46
@asmorkalov asmorkalov merged commit afe6ddd into opencv:4.x Dec 16, 2022
asmorkalov pushed a commit to opencv/opencv that referenced this pull request Dec 16, 2022
…ain_objdetect

Megre together with opencv/opencv_contrib#3325

1. Move aruco_detector, aruco_board, aruco_dictionary, aruco_utils to objdetect
1.1 add virtual Board::draw(), virtual ~Board()
1.2 move `testCharucoCornersCollinear` to Board classes (and rename to `checkCharucoCornersCollinear`)
1.3 add wrappers to keep the old api working
3. Reduce inludes
4. Fix java tests (add objdetect import)
5. Refactoring

### Pull Request Readiness Checklist

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

- [x] I agree to contribute to the project under Apache 2 License.
- [x] 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
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake

```
**WIP**
force_builders=linux,win64,docs,Linux x64 Debug,Custom
Xbuild_contrib:Docs=OFF

build_image:Custom=ubuntu:22.04
build_worker:Custom=linux-1
```
@alalek alalek mentioned this pull request Jan 8, 2023
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
…o_to_main_objdetect

Megre together with opencv/opencv_contrib#3325

1. Move aruco_detector, aruco_board, aruco_dictionary, aruco_utils to objdetect
1.1 add virtual Board::draw(), virtual ~Board()
1.2 move `testCharucoCornersCollinear` to Board classes (and rename to `checkCharucoCornersCollinear`)
1.3 add wrappers to keep the old api working
3. Reduce inludes
4. Fix java tests (add objdetect import)
5. Refactoring

### Pull Request Readiness Checklist

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

- [x] I agree to contribute to the project under Apache 2 License.
- [x] 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
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake

```
**WIP**
force_builders=linux,win64,docs,Linux x64 Debug,Custom
Xbuild_contrib:Docs=OFF

build_image:Custom=ubuntu:22.04
build_worker:Custom=linux-1
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants