Skip to content

Fix segmentation py#17394

Merged
alalek merged 2 commits intoopencv:3.4from
huningxin:fix_segmentation_py
May 27, 2020
Merged

Fix segmentation py#17394
alalek merged 2 commits intoopencv:3.4from
huningxin:fix_segmentation_py

Conversation

@huningxin
Copy link
Copy Markdown
Contributor

@huningxin huningxin commented May 27, 2020 •
edited
Loading

relate to #17362

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 OpenCV (BSD) 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
  • There is reference to 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

@huningxin huningxin mentioned this pull request May 27, 2020
Closed
alalek
alalek reviewed May 27, 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 for contribution!

Please fix similar problem in another sample too:

./samples/dnn/mask_rcnn.py:46:            cv.putText(block, classes[i], (0, blockHeight/2), cv.FONT_HERSHEY_SIMPLEX, 0.5, (255, 255, 255))

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".

@huningxin huningxin force-pushed the fix_segmentation_py branch from 48edf87 to fc050d2 Compare May 27, 2020 07:35
@huningxin huningxin changed the base branch from master to 3.4 May 27, 2020 07:35
@huningxin
Copy link
Copy Markdown
Contributor Author

huningxin commented May 27, 2020

@alalek , thanks for your detailed steps. I've done them. Please take another look.

alalek
alalek approved these changes May 27, 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!

@alalek alalek merged commit fef6192 into opencv:3.4 May 27, 2020
@huningxin huningxin deleted the fix_segmentation_py branch May 28, 2020 06:23
@alalek alalek mentioned this pull request May 28, 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: dnn category: samples

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

2 participants

@huningxin @alalek