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 |
|
Vladislav Vinogradov
|
1652540a1f
|
refactored HoughLines (converted it into Algorithm)
|
2013-07-17 11:39:54 +04:00 |
|
Vladislav Vinogradov
|
48fb8c4f8a
|
refactored gpu::Canny (converted it into Algorithm)
|
2013-07-17 11:39:53 +04:00 |
|
Vladislav Vinogradov
|
9eea9835ab
|
switched to Input/Output Array in Color Processing
|
2013-07-17 11:39:52 +04:00 |
|
Andrey Kamaev
|
5e048d1fa5
|
Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
|
2013-04-12 14:37:01 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +04:00 |
|
Vladislav Vinogradov
|
fe2e89df1b
|
added gpu::HoughLinesP function
|
2013-02-13 15:56:58 +04:00 |
|
Vladislav Vinogradov
|
41c9377db0
|
fixed warnings under windows
|
2012-12-18 18:03:54 +04:00 |
|
Vladislav Vinogradov
|
1a1f454241
|
updated gpu houghlines sample
|
2012-12-17 11:15:45 +04:00 |
|
Vladislav Vinogradov
|
caf91ac159
|
new gpu::HoughLinesP implementation
|
2012-12-13 17:18:25 +04:00 |
|
Vladislav Vinogradov
|
aad76090ce
|
gpu::HoughLinesP
|
2012-12-06 15:14:20 +04:00 |
|