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
|
3890a74565
|
Drop outdated definitions from internal.hpp
This also fixes few clang build errors
|
2013-04-01 15:24:35 +04:00 |
|
Andrey Kamaev
|
addf0309ec
|
Move cv::Size_
|
2013-04-01 15:24:32 +04:00 |
|
Andrey Kamaev
|
2e91405833
|
Fix OS X build warnings
|
2012-10-22 20:33:14 +04:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Vadim Pisarevsky
|
846e37ded5
|
fixed many warnings from GCC 4.6.1
|
2012-03-17 09:22:31 +00:00 |
|
Vadim Pisarevsky
|
54ef4c08c2
|
moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time
|
2010-11-26 17:58:20 +00:00 |
|