issue #5769 fixed: cv::stereoRectify fails if given inliers mask of t…#15341
Merged
alalek merged 5 commits intoopencv:3.4from Sep 16, 2019
DiebBlue:is5769
Merged
issue #5769 fixed: cv::stereoRectify fails if given inliers mask of t…#15341alalek merged 5 commits intoopencv:3.4from DiebBlue:is5769
alalek merged 5 commits intoopencv:3.4from
DiebBlue:is5769
Conversation
alalek
reviewed
Aug 20, 2019
Member
alalek
left a comment
There was a problem hiding this comment.
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)
whereupstreamis configured by following this GitHub guide and fetched (git fetch upstream). - push rebased commits into source branch of your fork (with
--forceoption)
Note: no needs to re-open PR, apply changes "inplace".
modules/calib3d/src/five-point.cpp
Outdated
| if (!_mask.empty()) | ||
| { | ||
| Mat mask = _mask.getMat(); | ||
| Mat mask = _mask.getMat().t(); |
Member
There was a problem hiding this comment.
- Please add simple test for that (to avoid regressions in the future). No need to use input images, specify some valid points set in test directly. Example of simple test
- Vectors layout in OpenCV is not specified. Usually both row-based and column-based vectors should be handled.
- Use fast
.reshape()instead of copy-basedtranspose().
Member
|
Lets continue working on "master" branch. I will rebase onto "3.4" before merge. |
Author
|
I have already rebased my local commits on 3.4. |
Member
|
OK. Please update PR target branch again after force push of local changes into fork (you should see on "commits" tab your commits only). |
Author
|
Ok, I work on it. :) |
Author
|
How is it going to continue here? |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…ype vector
resolves #5769
This pullrequest changes
original: mask1, mask2, mask3, mask4 will be transposed but not the input mask -> so
CV_Assert(mask.size() == mask1.size())causes an exception.fix: the input mask will also be transposed like the masks 1 to 4, so that the sizes fit again and than it works.
(see also [https://github.com//issues/5769])