Merge 2.4 into master#975
Merged
opencv-pushbot merged 47 commits intoopencv:masterfrom Jun 11, 2013
SpecLad:merge-2.4
Merged
Conversation
In current implementation, this function only works when anchor point is in the kernel center and kernel size supported is either 3x3 or 5x5.
The new sample adjust some parameters thus it should always be able to calculate valid homography matrix when input is box.png and box_in_scene.png. Pure cpp surf and bfmatcher implementation is also added to show the user its accuracy and performance.
Added for better compatibility with the current samples/test cases. User now will be able to initialize OpenCL context explicitly with ocl::getDevice api. This may be obsoleted in future releases.
…s wrong (e.g. native compilation on ARM Linux)
When user provided corners buffer is big enough to be copied to from tmpCorners_, we allow the buffer to be reused other than allocate a new cl_mem object.
links with CUDA driver library only if we use video encoding/decoding
old version isn't compiled with CUDA 5.5 new version doesn't depend on functional.hpp
the output of BroxOpticalFlow differs a bit in CUDA 5.5
+ interpolateFrames and createOpticalFlowNeedleMap
changed line281 -> line220 Presentation: because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!! it will never be unequal ~ fix: change mDetectorType(previous globle var) to a new local val tmpDetectorType
We don't really need it, it makes the code longer, and it can lead to inconsistent paths when OpenCV is itself inside a symlink.
The bug is a buffer overrun when border type is reflect101. It is found that gfft crashed with input of size 100x100 on Intel CPU.
Also, removing explicit include path configuration, since QT_USE_FILE takes care of that.
Merged pull requests: #890 from caorong:patch-1 #893 from jet47:gpu-arm-fixes #933 from pengx17:2.4_macfix_cont #935 from pengx17:2.4_filter2d_fix #936 from bitwangyaoyao:2.4_perf #937 from bitwangyaoyao:2.4_fixPyrLK #938 from pengx17:2.4_surf_sample #939 from pengx17:2.4_getDevice #940 from SpecLad:autolock #941 from apavlenko:signed_char #946 from bitwangyaoyao:2.4_samples2 #947 from jet47:fix-gpu-arm-build #948 from jet47:cuda-5.5-support #952 from SpecLad:jepg #953 from jet47:fix-bug-3069 #955 from SpecLad:symlink #957 from pengx17:2.4_fix_corner_detector #959 from SpecLad:qt4-build #960 from SpecLad:extra-modules Conflicts: modules/core/include/opencv2/core/core.hpp modules/gpu/CMakeLists.txt modules/gpu/include/opencv2/gpu/device/vec_math.hpp modules/gpu/perf/perf_video.cpp modules/gpuimgproc/src/cuda/hough.cu modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/pyrlk.cpp samples/gpu/driver_api_multi.cpp samples/gpu/driver_api_stereo_multi.cpp samples/ocl/surf_matcher.cpp
Contributor
|
@apavlenko Andrey, please, review this request. |
Contributor
|
👍 |
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
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.
Merged pull requests:
#890 from caorong:patch-1
#893 from jet47:gpu-arm-fixes
#933 from pengx17:2.4_macfix_cont
#935 from pengx17:2.4_filter2d_fix
#936 from bitwangyaoyao:2.4_perf
#937 from bitwangyaoyao:2.4_fixPyrLK
#938 from pengx17:2.4_surf_sample
#939 from pengx17:2.4_getDevice
#940 from SpecLad:autolock
#941 from apavlenko:signed_char
#946 from bitwangyaoyao:2.4_samples2
#947 from jet47:fix-gpu-arm-build
#948 from jet47:cuda-5.5-support
#952 from SpecLad:jepg
#953 from jet47:fix-bug-3069
#955 from SpecLad:symlink
#957 from pengx17:2.4_fix_corner_detector
#959 from SpecLad:qt4-build
#960 from SpecLad:extra-modules