Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
12 years ago |
Alexander Pacha
|
eaa29110e1
|
Fixed issue 3130 (http://code.opencv.org/issues/3130), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
|
12 years ago |
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
12 years ago |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
12 years ago |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
12 years ago |
Vincent Rabaud
|
d235c3a678
|
define the default remapping in the right scope
|
12 years ago |
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
13 years ago |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
13 years ago |
|
Andrey Kamaev
|
5a730d09cd
|
Fix binary compatibility of opencv_features2d
|
13 years ago |
|
Andrey Kamaev
|
b8adc04545
|
Fix Android build warnings
|
13 years ago |
Vadim Pisarevsky
|
014106783d
|
fixed building BRISK on Windows
|
13 years ago |
|
Vincent Rabaud
|
84c4797030
|
revert orientation computation in jeypoint detection for efficiency (like done originally)
|
13 years ago |
|
Vincent Rabaud
|
da1921b2fc
|
add const correctness, replace __inline__ and remote a useless release()
|
13 years ago |
|
Vincent Rabaud
|
92da6d381b
|
add rotation tests for the descriptors
|
13 years ago |
|
Vincent Rabaud
|
13ded36ecb
|
initial addition of BRISK with some tests
|
13 years ago |
