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
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Andrey Kamaev
|
13b31b0804
|
Move C++ basic structures to separate header and inverse dependency from C API
cv::Complex, cv::Point_ and cv::Point3_ are moved.
|
2013-04-01 15:24:32 +04:00 |
|
Vladislav Vinogradov
|
ae47b8f06c
|
fixed misprint in icvCreateIsometricImage
|
2013-04-01 11:23:27 +04:00 |
|
Andrey Kamaev
|
3ead4449ad
|
Fix several warnings about uninitialized variables from gcov build
|
2013-02-15 17:28:23 +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 |
|
Andrey Kamaev
|
691d392312
|
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
|
2012-02-16 20:29:35 +00:00 |
|
Vadim Pisarevsky
|
716a5d04ab
|
fixed a few problems detected by Xcode 4.2.1
|
2012-02-15 19:48:04 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|