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
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Marina Kolpakova
|
680a44189c
|
merged the trunk r8704:8716
|
2012-06-28 16:13:29 +00:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +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
|
f62028dc16
|
Fixed mingw build.
|
2012-06-08 03:15:08 +00:00 |
|
Vadim Pisarevsky
|
beb7fc3c92
|
a LOT of obsolete stuff has been moved to the legacy module.
|
2012-03-30 12:19:25 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Vadim Pisarevsky
|
23768b1826
|
replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719)
|
2011-05-21 18:32:34 +00:00 |
|
Gary Bradski
|
db426d26d8
|
teek
|
2010-12-02 23:49:21 +00:00 |
|
Gary Bradski
|
4db4569b60
|
put doc comments on top
|
2010-12-01 02:50:27 +00:00 |
|
Vadim Pisarevsky
|
042271f5f7
|
use the new-style headers in the samples to improve OpenCV build time.
|
2010-11-26 17:59:40 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|