Bugfix: Manual page sizes now overwrite the default page size if they…#18664
Merged
opencv-pushbot merged 1 commit intoopencv:3.4from Oct 27, 2020
Merged
Conversation
alalek
reviewed
Oct 27, 2020
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".
doc/pattern_tools/gen_pattern.py
Outdated
| # page size dict (ISO standard, mm) for easy lookup. format - size: [width, height] | ||
| page_sizes = {"A0": [840, 1188], "A1": [594, 840], "A2": [420, 594], "A3": [297, 420], "A4": [210, 297], | ||
| "A5": [148, 210]} | ||
| page_width = page_sizes[page_size.upper()][0] |
Member
There was a problem hiding this comment.
Let make error messages user-friendly:
assert page_size.upper() in page_sizes, page_size.keys()
Author
There was a problem hiding this comment.
@alalek That wasn't originally my code, but I did some tests and those .upper() calls are redundant. The choices list in argparse enforces a 1 to 1 match on the user entered string and the keys in page_sizes. I just went ahead and removed it altogether.
19241ee to
817ae10
Compare
… are both specified. Remove redudant .upper() call, 1 to 1 key matching enforced by argparse choices.
817ae10 to
d011383
Compare
alalek
approved these changes
Oct 27, 2020
Merged
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
3 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.
Bugfix: Manual page sizes now overwrite the default page size if they are both specified.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.