Skip to content

Fix an arg for calcHist() in demos#20330

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
Wovchena:fix-arg-for-calcHist-in-demos
Jun 30, 2021
Merged

Fix an arg for calcHist() in demos#20330
opencv-pushbot merged 1 commit intoopencv:3.4from
Wovchena:fix-arg-for-calcHist-in-demos

Conversation

@Wovchena
Copy link
Copy Markdown
Contributor

float* histRange = { range }; doesn't make much sense. histRange is
an array of array(s), so it should have a type of ptr to ptr. Strangely
some domos are correct as well as the example for the function
https://docs.opencv.org/master/d6/dc7/group__imgproc__hist.html#ga4b2b5fd75503ff9e6844cc4dcdaed35d

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 Apache 2 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

@Wovchena
Copy link
Copy Markdown
Contributor Author

@alalek, this is the code patch, but where are the sources for corresponding tutorials like https://docs.opencv.org/4.5.2/d8/dbc/tutorial_histogram_calculation.html?

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 30, 2021

You can find documentation for this PR here: http://pullrequest.opencv.org/buildbot/export/pr/20330/docs/

@Wovchena
Copy link
Copy Markdown
Contributor Author

I mean what are the other files I should update?

What am I supposed to do with

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

?

And should I do something about broken builds?

@Wovchena
Copy link
Copy Markdown
Contributor Author

I mean what are the other files I should update?

Got it. The are regenerated after the code, and look fine

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 30, 2021

Documentation reuses code from .cpp files.

Skip this.

Ignore failures of CN builders (there are network problems).

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 30, 2021

This patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

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

@Wovchena Wovchena changed the base branch from master to 3.4 June 30, 2021 14:20
`float* histRange = { range };` doesn't make much sense. `histRange` is
an array of array(s), so it should have a type of ptr to ptr. Strangely
some domos are correct as well as the example for the function
https://docs.opencv.org/master/d6/dc7/group__imgproc__hist.html#ga4b2b5fd75503ff9e6844cc4dcdaed35d
@Wovchena Wovchena force-pushed the fix-arg-for-calcHist-in-demos branch from 42d145b to 90be83a Compare June 30, 2021 14:24
@Wovchena
Copy link
Copy Markdown
Contributor Author

That's the detailed instruction :)
Done

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 04d5ba2 into opencv:3.4 Jun 30, 2021
@alalek alalek mentioned this pull request Jul 1, 2021
@alalek alalek mentioned this pull request Oct 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants