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
|
62353b7980
|
Boring changes - samples.
|
12 years ago |
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
12 years ago |
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
13 years ago |
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
13 years ago |
Vadim Pisarevsky
|
846e37ded5
|
fixed many warnings from GCC 4.6.1
|
13 years ago |
Vadim Pisarevsky
|
957e80abbd
|
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
|
13 years ago |
Vadim Pisarevsky
|
fcd2a0c3d3
|
fixed VS2010 compile warnings and errors
|
14 years ago |
Vadim Pisarevsky
|
23768b1826
|
replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719)
|
14 years ago |
Vadim Pisarevsky
|
9a991a2e10
|
fixed build problems on Windows
|
14 years ago |
Anatoly Baksheev
|
998fab0ef5
|
warningx fixed under vs2008
|
14 years ago |
Gary Bradski
|
282a9f8521
|
revamped
|
14 years ago |
Gary Bradski
|
0ebd45e188
|
added help and help on error
|
14 years ago |
Vadim Pisarevsky
|
042271f5f7
|
use the new-style headers in the samples to improve OpenCV build time.
|
14 years ago |
Ethan Rublee
|
5915e4c7ee
|
adding samples for brief and the cout << cv::Mat functions.
|
14 years ago |