Merge 2.4 to master.#921
Merged
opencv-pushbot merged 9 commits intoopencv:masterfrom May 29, 2013
SpecLad:merge-2.4
Merged
Conversation
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
…he object has been initialized.
Pull requests: #904 from ograycode:2.4 #905 from bitwangyaoyao:2.4_TVL1 #902 from apavlenko:fix_run_py #882 from pengx17:2.4_rewrite_query_info Conflicts: modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/src/hog.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/tvl1flow.cpp
Author
There was a problem hiding this comment.
@apavlenko That's how it was in the original commit. I'm not fixing these kind of bugs during merges.
(And if I did, I'd delete this line entirely; it's useless.)
Contributor
|
👍 |
1 similar comment
Contributor
|
👍 |
opencv-pushbot
pushed a commit
that referenced
this pull request
May 29, 2013
savuor
pushed a commit
to nickyu-zhu/opencv
that referenced
this pull request
Oct 27, 2023
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
7 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.
Pull requests:
#904 from ograycode:2.4
#905 from bitwangyaoyao:2.4_TVL1
#902 from apavlenko:fix_run_py
#882 from pengx17:2.4_rewrite_query_info