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
11 years ago
Roman Donchenko
62353b7980
Boring changes - samples.
11 years ago
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
12 years ago
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
12 years ago
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
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
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
13 years ago
Vadim Pisarevsky
562914e33b
upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.
14 years ago
Vadim Pisarevsky
23768b1826
replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719 )
14 years ago
Gary Bradski
11f4e1028b
revamped
14 years ago
Vadim Pisarevsky
f2a3e7e312
converted some more samples to C++
14 years ago
Vadim Pisarevsky
91d8b2aaac
removed garbage from the image sample
14 years ago
Vadim Pisarevsky
042271f5f7
use the new-style headers in the samples to improve OpenCV build time.
14 years ago
Vadim Pisarevsky
9e7b8d5f67
rewrote matchTemplate in C++; added border awareness to crossCorr (ticket #557 )
14 years ago
Victor Erukhimov
cf2031b146
Fixed a compilation problem when the DEMO_MIX_API_USE is not defined
14 years ago
Vadim Pisarevsky
127d6649a1
"atomic bomb" commit. Reorganized OpenCV directory structure
15 years ago