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
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +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 |
|
itsyplen
|
86cd9fadf3
|
Fixed some grammatical errors
|
2011-08-10 08:52:52 +00:00 |
|
Kirill Kornyakov
|
87ad9b1c3e
|
samples C/C++: fixed compilation problem on Ubuntu
|
2011-07-14 12:50:07 +00:00 |
|
itsyplen
|
a1ee9d406e
|
Help and parsing command line were updated in next samples: camshiftdemo, calibration_artificial
|
2011-06-09 08:37:39 +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
|
68a156d6bb
|
revamped
|
2010-12-04 08:30:50 +00:00 |
|
Gary Bradski
|
715ca399f1
|
docs
|
2010-11-29 08:32:57 +00:00 |
|
Vadim Pisarevsky
|
f2a3e7e312
|
converted some more samples to C++
|
2010-11-28 19:41:55 +00:00 |
|