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
|
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 |
|
Marina Kolpakova
|
6727e4cb6d
|
fixed build under android
|
2012-06-10 09:44:47 +00:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Andrey Kamaev
|
54a4ff033a
|
Fixed #1711
|
2012-03-26 13:17:18 +00:00 |
|
Andrey Kamaev
|
bddff7b386
|
Fixed Android build warnings in logpolar_bsm
|
2012-03-19 12:55:44 +00:00 |
|
Vadim Pisarevsky
|
c94c3fb4eb
|
added Manuela Chessa as the co-author of logpolar_bsm.
|
2012-03-19 12:04:50 +00:00 |
|
Vadim Pisarevsky
|
c8e206c2ab
|
added LogPolar Blind Spot Model (thanks to Fabio Solari for the contribution)
|
2012-03-18 22:29:13 +00:00 |
|