Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
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>
|
2013-03-13 17:26:56 +04:00 |
|
Marina Kolpakova
|
680a44189c
|
merged the trunk r8704:8716
|
2012-06-28 16:13:29 +00:00 |
|
Andrey Kamaev
|
e94e5866a1
|
Fixed mingw build warnings
|
2012-06-20 17:57:26 +00:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
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.
|
2011-07-13 23:04:39 +00:00 |
|
Vadim Pisarevsky
|
848be8dfe1
|
temporarily reverted to FLANN 1.5 (FLANN 1.6 is put to a separate branch FLANN_1.6 until it's stabilized)
|
2011-06-20 09:20:17 +00:00 |
|
Vadim Pisarevsky
|
6767f1db9e
|
added dummy symbol to flann to make OpenCV compile on Windows
|
2011-06-20 08:42:08 +00:00 |
|
Marius Muja
|
9153018bd2
|
Updated FLANN
|
2011-06-19 23:46:23 +00:00 |
|
Marius Muja
|
53e6bab678
|
Prefixed constants in flann with FLANN_ to prevent clashes with constants from other includes, closes bug #890
|
2011-02-16 08:42:52 +00:00 |
|
Marius Muja
|
7d42dbdd71
|
Removing 'using namespace std' from header files, closes bugs #730 and #846
|
2011-02-16 06:36:15 +00:00 |
|
Marius Muja
|
9bf80fb209
|
Renaming log constants, fixes bug #792
|
2011-01-05 22:06:03 +00:00 |
|
Vadim Pisarevsky
|
d8ace43753
|
fixed some more tests on Windows; changed inheritance Matx -> Vec to Vec -> Matx
|
2010-11-06 21:51:21 +00:00 |
|
Vadim Pisarevsky
|
f678c8f07b
|
made FLANN (and dependent on it code) build fine on Windows. Most of the changes are added CV_EXPORTS' into the class declarations and extern variables are turned into external functions (as a nice side effect the variables are now read-only)
|
2010-10-15 18:57:59 +00:00 |
|
Marius Muja
|
16b1f61c83
|
Updated FLANN to version 1.5
|
2010-10-12 19:47:50 +00:00 |
|