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
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
1852cb7eab
Fix tegra build warnings
2012-08-07 14:29:51 +04:00
Marina Kolpakova
1365e28a54
initial support of GPU LBP classifier: added new style xml format loading
2012-06-22 15:00:36 +00:00
Anatoly Baksheev
25cadb1abd
fixed compilation under ubuntu
2011-09-21 18:25:22 +00:00
Alexey Kazakov
50543d627f
Added HOG features to cascade detection algorithm.
...
Added pedestrian detection trained model for HOG cascade detection algorithm.
2011-09-21 18:03:53 +00:00
Leonid Beynenson
aa78754720
Changed tabulation.
2011-08-10 14:21:20 +00:00
Leonid Beynenson
dc13ec205d
Made additional internal header modules/objdetect/src/cascadedetect.hpp, and moved
...
some internal classes and template functions from cascadedetect.cpp to this header.
This will allow to make a child class for such classes as LBPEvaluator, etc.
Also made all "private" fields in LBPEvaluator and HaarEvaluator to be "protected".
2011-07-29 14:18:45 +00:00
