Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
Alexander Smorkalov
|
4c1ed13846
|
Warning fixes for GCC 4.8.
|
2014-02-18 23:53:35 +04:00 |
|
Alexander Smorkalov
|
1aaeb52a4c
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:36:12 +04:00 |
|
Alexander Smorkalov
|
ccb48ddee0
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:23:50 +04:00 |
|
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 |
|
Vadim Pisarevsky
|
07e0f7bf59
|
refactored video module; use the new-style algorithms now
|
2013-03-20 19:51:49 +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 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Vadim Pisarevsky
|
5b6b30ba0e
|
added dedicated <modname>_init.cpp files with initModule_<modname>() functions and all the relevant structures; made BackgroundSubtractorMOG/MOG2 derivatives from Algorithm; cleaned up MOG2 implementation and made it multi-threaded.
|
2012-04-20 15:32:54 +00:00 |
|
Andrey Kamaev
|
a4f5216d52
|
Fixed gcc build after r7751
|
2012-03-30 14:03:18 +00:00 |
|
Vadim Pisarevsky
|
beb7fc3c92
|
a LOT of obsolete stuff has been moved to the legacy module.
|
2012-03-30 12:19:25 +00:00 |
|