Skip to content

Use argument value for 'mat' in call to format for vector_mat and vector_mat_template#15765

Merged
alalek merged 2 commits intoopencv:3.4from
zachlowry:patch-1
Mar 4, 2020
Merged

Use argument value for 'mat' in call to format for vector_mat and vector_mat_template#15765
alalek merged 2 commits intoopencv:3.4from
zachlowry:patch-1

Conversation

@zachlowry
Copy link
Copy Markdown
Contributor

The hard-coded string value "Mat" was used in the two format strings for vector_mat and vector_mat_template, preventing UMat arguments to functions that have these types from working correctly. as noted in #12231.

resolves #12231

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 24, 2019

Thank you for contribution!

Please add some simple test here: https://github.com/opencv/opencv/blob/4.1.2/modules/python/test/test_umat.py

@asmorkalov
Copy link
Copy Markdown
Contributor

@zachlowry Friendly reminder. Do you have a chance to add test for your fix?

@asmorkalov
Copy link
Copy Markdown
Contributor

@VadimLevin could you join the discussion and propose test for the case?

@asmorkalov asmorkalov added the Hackathon https://opencv.org/opencv-hackathon-starts-next-week/ label Feb 3, 2020
@asmorkalov asmorkalov added Hackathon https://opencv.org/opencv-hackathon-starts-next-week/ and removed Hackathon https://opencv.org/opencv-hackathon-starts-next-week/ labels Feb 14, 2020
@VadimLevin VadimLevin removed the pr: needs test New functionality requires minimal tests set label Mar 3, 2020
@VadimLevin
Copy link
Copy Markdown
Contributor

@alalek I added tests, so PR is ready

@alalek
Copy link
Copy Markdown
Member

alalek commented Mar 3, 2020

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

@VadimLevin VadimLevin changed the base branch from master to 3.4 March 4, 2020 05:05
Zach Lowry and others added 2 commits March 4, 2020 08:14
…tor_mat_template

The hard-coded string value "Mat" was used in the two format strings for vector_mat and vector_mat_template, preventing UMat arguments to functions that have these types from working correctly. as noted in opencv#12231.
@VadimLevin
Copy link
Copy Markdown
Contributor

@alalek rebase is done

@VadimLevin VadimLevin removed the pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch label Mar 4, 2020
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 da6ad1c into opencv:3.4 Mar 4, 2020
@alalek alalek mentioned this pull request Mar 4, 2020
@zachlowry zachlowry deleted the patch-1 branch October 21, 2024 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category: python bindings Hackathon https://opencv.org/opencv-hackathon-starts-next-week/

Projects

None yet

Development

Successfully merging this pull request may close these issues.

No UMat support in functions split() and merge()

4 participants