Commit Graph

59 Commits

Author SHA1 Message Date
Roman Donchenko
f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Alexander Smorkalov
16c4aad36d Java/Python bindings for computeCorrespondEpilines added.
Simle Java test for computeCorrespondEpilines added.
2013-06-18 16:44:23 +04:00
Andrey Kamaev
e5a33723fc Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Vadim Pisarevsky
44157c421f fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs 2013-03-25 00:42:46 +04:00
Vadim Pisarevsky
7b5923e98b fixed docs and compile error on Linux 2013-03-24 23:09:17 +04:00
Vadim Pisarevsky
7661625c39 converter stereo correspondence algorithms to the new style 2013-03-22 01:05:30 +04:00
Andrey Kamaev
a1c456b7c3 Extract common base header for C and C++ APIs 2013-03-15 10:38:38 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Vadim Pisarevsky
df89f30b4a removed preset parameter in createStereoBM, updated stereo_match sample 2013-03-02 02:17:49 +04:00
Vadim Pisarevsky
b6efe30527 new API for StereoMatchers 2013-03-01 02:24:46 +04:00
alegarda
62655b05f4 Indentation ok 2013-02-21 15:25:22 +01:00
alegarda
76d03fccb9 Added Thin Prism Distortion Model
Only the code.
2013-02-20 15:11:47 +01:00
Bo Li
956a029ede added code, test and doc for five-point algorithm 2012-12-26 18:58:50 +01: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
Andrey Kamaev
81a5988015 Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes) 2012-05-30 11:13:07 +00:00
Andrey Kamaev
eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +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
Ilya Lysenkov
e7b4353505 Added termination criteria as a calibrateCamera() parameter 2012-03-29 17:19:15 +00:00
Ilya Lysenkov
f29912b501 Added wrappers of cvCorrectMatches (#1350) 2012-03-29 13:21:24 +00:00
Ilya Lysenkov
37db334f8a Added wrappers of cvTriangulatePoints() 2012-03-29 10:39:06 +00:00
Ilya Lysenkov
207e46b425 Restored findCirclesGridDefault() for backward compatibility 2012-03-13 09:38:00 +00:00
Ilya Lysenkov
1252671c9d Added a full Python wrapper of findCirclesGrid 2012-03-12 11:40:46 +00:00
Alexander Shishkov
c11551a510 added P3P method
added test for solvePnP
changed test for solvePnPRansac
fixed bug with mutex solvePnPRansac
2011-12-26 12:59:07 +00:00
Alexander Shishkov
c5d8ec4ac0 first version of ePnP code 2011-12-20 11:33:12 +00:00
Vadim Pisarevsky
282c3044e6 exported C++ stereoRectify in Python 2011-10-05 00:14:43 +00:00
Vadim Pisarevsky
1badec0b2d eliminated opencv_extra_api.hpp (all the functionality is moved to the regular OpenCV headers) 2011-07-18 16:31:30 +00:00
Vadim Pisarevsky
2dea07f9f8 repaired Python bindings for functions using InputOutputArray 2011-07-14 14:13:10 +00:00
Vadim Pisarevsky
5bb8076d7d added centerPrincipalPoint=false to getOptimalNewCameraMatrix (ticket #1199) 2011-07-07 21:38:21 +00:00
Vadim Pisarevsky
f4dc4b43e4 fixed calibrateCamera API (ticket #1143) 2011-06-17 21:21:01 +00:00
Vadim Pisarevsky
6229af93d6 corrected estimateAffine3D parameter name: outliers=>inliers (ticket #1141) 2011-06-17 19:12:21 +00:00
Vadim Pisarevsky
2d2b8a496e renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122) 2011-06-08 06:55:04 +00:00
Vadim Pisarevsky
fcd2a0c3d3 fixed VS2010 compile warnings and errors 2011-06-06 15:15:30 +00:00
Vadim Pisarevsky
0c877f62e9 replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()). 2011-06-06 14:51:27 +00:00
Ilya Lysenkov
a685be3ea9 Added extra argument for BlobDetector in findCirclesGrid 2011-05-06 14:02:07 +00:00
Vadim Pisarevsky
d02a0cab48 updated OpenCV version to 2.2.9; added missing cv::convertPointsHomogeneous for backward compatibility; fixed bug #952 2011-05-02 22:20:22 +00:00
Vadim Pisarevsky
83efef4b9a added overloaded variants of findHomography & findFundamentalMat for backward compatibility 2011-04-23 12:49:14 +00:00
Vadim Pisarevsky
abeeb40d46 a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc. 2011-04-17 13:14:45 +00:00
Ilya Lysenkov
37cd2b6f25 Implemented new algorithm for asymmetric circles pattern detection. Use flag CALIB_CB_CLUSTERING. 2011-04-15 15:33:11 +00:00
Alexander Shishkov
04461a53f1 added solvePnPRansac method 2011-03-05 00:18:49 +00:00
Vadim Pisarevsky
65a7f13af3 replaced alloca() (a.k.a. cvStackAlloc) with AutoBuffer or vector() everywhere. cvStackAlloc() is still defined, but we do not need alloca() anymore to compile and run OpenCV (fixes #889 and may be some others) 2011-02-18 10:29:57 +00:00
Vadim Pisarevsky
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Ilya Lysenkov
f8e9f65ea8 Added detection of asymmetric circles' pattern 2011-02-07 07:57:32 +00:00
Ilya Lysenkov
964df356bf Added detection of cirlces' grid pattern 2010-12-21 09:24:36 +00:00
Vadim Pisarevsky
b1722352b8 fixed severe bug: CV_RANSAC != CV_FM_RANSAC, CV_LMEDS != CV_FM_LMEDS 2010-11-29 23:56:33 +00:00
Vadim Pisarevsky
70d2c57e35 moved estimateAffine3D declaration from imgproc to calib3d, where it is really implemented (ticket #705) 2010-11-29 20:51:02 +00:00
Vadim Pisarevsky
eea43c6a46 added CV_CALIB_RATIONAL_MODEL for better backward compatibility 2010-11-29 20:06:44 +00:00
Vadim Pisarevsky
cbe132cabe several small fixes; added overloaded variant of cv::drawChessboardCorners 2010-11-27 23:16:50 +00:00