Skip to content

Fix typo#17537

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
Murazaki:patch-1
Jun 13, 2020
Merged

Fix typo#17537
opencv-pushbot merged 1 commit intoopencv:3.4from
Murazaki:patch-1

Conversation

@Murazaki
Copy link
Copy Markdown
Contributor

@Murazaki Murazaki commented Jun 12, 2020

This typo just made me lose my mind on the conan package update. please merge.

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

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 12, 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".

@Murazaki Murazaki changed the base branch from master to 3.4 June 12, 2020 20:47
@Murazaki
Fix typo
b0def96 
This typo just made me lose my mind on the conan package update. please merge.
@Murazaki
Copy link
Copy Markdown
Contributor Author

Murazaki commented Jun 12, 2020

This bug affects other versions like 4.2.0 too, even though the code is different on this line :
https://github.com/opencv/opencv/blob/4.2.0/cmake/OpenCVFindOpenEXR.cmake#L71

alalek
alalek approved these changes Jun 13, 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 fb1a58a into opencv:3.4 Jun 13, 2020
@alalek alalek mentioned this pull request Jun 18, 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: build/install

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

3 participants

@Murazaki @alalek @opencv-pushbot