Skip to content

Fixed cascadedetect convert from old cascade to new#17420

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
nosajthenitram:fix_cascadedetect_convert_bug_for_old_cascade
May 30, 2020
Merged

Fixed cascadedetect convert from old cascade to new#17420
opencv-pushbot merged 1 commit intoopencv:3.4from
nosajthenitram:fix_cascadedetect_convert_bug_for_old_cascade

Conversation

@nosajthenitram
Copy link
Copy Markdown
Contributor

@nosajthenitram nosajthenitram commented May 29, 2020 •
edited
Loading

Pull Request Readiness Checklist

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

  • [ y] I agree to contribute to the project under OpenCV (BSD) License.
  • [y ] 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
  • [n ] There is reference to original bug report and related work - no bug report was opened. it's a straightforward fix.
  • [n ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name. - simple fix for cascade conversions
  • [n ] The feature is well documented and sample code can be built with the project CMake - simple fix

@alalek
Copy link
Copy Markdown
Member

alalek commented May 29, 2020

Thank you for contribution!

As a bugfix this patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@nosajthenitram nosajthenitram changed the base branch from master to 3.4 May 30, 2020 16:40
@nosajthenitram nosajthenitram force-pushed the fix_cascadedetect_convert_bug_for_old_cascade branch from c006656 to a5209c4 Compare May 30, 2020 16:47
@nosajthenitram
Copy link
Copy Markdown
Contributor Author

nosajthenitram commented May 30, 2020 •
edited
Loading

Followed your steps above. PR should be rebased on 3.4 upstream. Let me know if there's anything else to change.

alalek
alalek approved these changes May 30, 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.

Thank you 👍

@opencv-pushbot opencv-pushbot merged commit e6c9e2f into opencv:3.4 May 30, 2020
@alalek alalek mentioned this pull request Jun 4, 2020
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

bug category: apps OpenCV builtin tools Hackathon https://opencv.org/opencv-hackathon-starts-next-week/

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

3 participants

@nosajthenitram @alalek @opencv-pushbot