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
|
b131dfeecd
|
Build tutorial codes together with other samples
These codes should be included into regular builds.
|
2012-11-09 10:15:48 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Ana Huaman
|
22e59e933b
|
Added Threshold.cpp in samples/cpp/tutorial_code/ImgProc
|
2011-06-21 23:50:02 +00:00 |
|
Ana Huaman
|
5df9da1576
|
Added Pyramids.cpp sample tutorial code
|
2011-06-21 20:33:35 +00:00 |
|
Ana Huaman
|
2819438fe6
|
Reorganized code and added Morphology 2 cpp code
|
2011-06-21 05:06:25 +00:00 |
|