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
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +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
|
3876cf22e3
|
reverted samples with new command argument parser. will be continued after OpenCV release.
|
2011-06-09 12:01:47 +00:00 |
|
Kirill Kornyakov
|
534ac83b8d
|
update help corresponding single format and update some samples through using CommandLineParser class
|
2011-05-29 10:01:01 +00:00 |
|
Kirill Kornyakov
|
dc3fe6e9cf
|
update help according single standart for it
|
2011-05-28 10:53:53 +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 |
|
Kirill Kornyakov
|
aadb1669a7
|
some samples updated according to new CommandLineParser class
|
2011-05-21 14:09:03 +00:00 |
|
Anatoly Baksheev
|
8ebff41c29
|
more warnings fixed. +some warnings in examples
|
2011-05-07 12:06:58 +00:00 |
|
Gary Bradski
|
a3d7aebbef
|
revamped
|
2010-12-04 08:34:54 +00:00 |
|
Gary Bradski
|
439b1057e6
|
added to and moved comments to top
|
2010-12-01 02:20:36 +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 |
|