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 |
Roman Donchenko
|
bd70a033fc
|
Boring changes - calib3d.
|
12 years ago |
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
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
|
1a621c2916
|
Fix build warnings
|
13 years ago |
Maria Dimashova
|
839761fa3d
|
fixed #2167
|
13 years ago |
Maria Dimashova
|
5112d74cad
|
revert my incorrect fix of #2167
|
13 years ago |
Maria Dimashova
|
d65920d2f7
|
fixed #2167
|
13 years ago |
Ilya Lysenkov
|
f29912b501
|
Added wrappers of cvCorrectMatches (#1350)
|
13 years ago |
Ilya Lysenkov
|
37db334f8a
|
Added wrappers of cvTriangulatePoints()
|
13 years ago |
Ilya Lysenkov
|
8fcd0d9222
|
Fixed the error message in cvCorrectMatches (fixes #1155)
|
13 years ago |
Vadim Pisarevsky
|
846e37ded5
|
fixed many warnings from GCC 4.6.1
|
13 years ago |
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
15 years ago |