Skip to content

fix Scharr nomination#17180

Merged
alalek merged 2 commits intoopencv:3.4from
PetWorm:3.4
Apr 29, 2020
Merged

fix Scharr nomination#17180
alalek merged 2 commits intoopencv:3.4from
PetWorm:3.4

Conversation

@PetWorm
Copy link
Copy Markdown
Contributor

@PetWorm PetWorm commented Apr 29, 2020

This merge aim to fix a historical nominating mistake

Resolves issue #17175

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

@PetWorm
Copy link
Copy Markdown
Contributor Author

PetWorm commented Apr 29, 2020

Notice that in 3.4, 'tegra::calcSharrDeriv' is used if HAVE_TEGRA_OPTIMIZATION. This function is in Opencv4Tegra and I think it is a subsequent mistake following original OpenCV. I'm new to this community so I don't know if there is any way to fix that.

Comment thread modules/video/src/lkpyramid.cpp Outdated
@dkurt dkurt mentioned this pull request Apr 29, 2020
6 tasks
calcScharrDeriv(prevPyr[level * lvlStep1], derivI);
copyMakeBorder(derivI, _derivI, winSize.height, winSize.height, winSize.width, winSize.width, BORDER_CONSTANT|BORDER_ISOLATED);
}
else
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grep shows there there should be 6 entries:

$ grep -r "Sharr" ~/opencv
./modules/video/src/lkpyramid.cpp:static void calcSharrDeriv(const cv::Mat& src, cv::Mat& dst)
./modules/video/src/lkpyramid.cpp:    parallel_for_(Range(0, rows), cv::detail::SharrDerivInvoker(src, dst), cv::getNumThreads());
./modules/video/src/lkpyramid.cpp:void cv::detail::SharrDerivInvoker::operator()(const Range& range) const
./modules/video/src/lkpyramid.cpp:    if (tegra::useTegra() && tegra::calcSharrDeriv(src, dst))
./modules/video/src/lkpyramid.cpp:            calcSharrDeriv(thisLevel, derivI);
./modules/video/src/lkpyramid.cpp:            calcSharrDeriv(prevPyr[level * lvlStep1], derivI);

Copy link
Copy Markdown
Member

@dkurt dkurt Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see, you have already mentioned tegra::calcSharrDeriv

Copy link
Copy Markdown
Member

@dkurt dkurt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good for me! Thanks!

@alalek alalek merged commit cdfa58d into opencv:3.4 Apr 29, 2020
@dkurt dkurt linked an issue Apr 29, 2020 that may be closed by this pull request
@alalek alalek mentioned this pull request May 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

A historical nominating mistake ?

3 participants