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 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04: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
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vladimir Dudnik
|
6e38b6aaed
|
removed trailing backspaces, reduced number of warnings (under MSVC2010 x64) for size_t to int conversion, added handling of samples launch without parameters (should not have abnormal termination if there was no paramaters supplied)
|
2011-06-17 06:31:54 +00:00 |
|
Gary Bradski
|
8dd8583596
|
revamped
|
2010-12-04 08:29:48 +00:00 |
|
Vadim Pisarevsky
|
b46d23a2aa
|
converted houghlines to C++
|
2010-11-29 14:00:21 +00:00 |
|