Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Dominik Rose
cfaae5917b
Calib3d documentation:
...
- fixed reference to Slabaugh
2013-04-26 11:34:35 +02:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
6ce050d264
Update docs
2013-04-03 14:10:03 +04:00
Vadim Pisarevsky
f8b61e4eca
fixed hopefully last warnings in the doc builder
2013-03-25 12:04:11 +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
0990b42ebc
Merge pull request #657 from prclibo:master
2013-03-21 12:23:49 +04:00
Bo Li
28256209b0
updated doc
2013-03-15 21:30:22 +01:00
Andrey Kamaev
e75df56317
Unified handling of InputOutputArrays in Python wrapper generator
...
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
2013-03-15 17:44:49 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
alegarda
6bf7fd997a
Indentation Ok
2013-02-21 15:48:23 +01:00
alegarda
62655b05f4
Indentation ok
2013-02-21 15:25:22 +01:00
alegarda
d3d8a782b5
Thin prism distortion model added doc
...
Thin prism distortion model added to the
camera_calibration_and_3d_reconstruction.rst
2013-02-20 15:25:49 +01:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Daniil Osokin
f9de98ec64
Fixed proposed values for speckleRange in StereoSGBM docs (bug #1937 )
2013-01-30 09:02:17 +04:00
Bo Li
956a029ede
added code, test and doc for five-point algorithm
2012-12-26 18:58:50 +01:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
Vsevolod Glumov
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
Maria Dimashova
a39cf2dd28
updated doc on triangulatePoints ( #2167 )
2012-07-25 17:51:37 +04:00
Maria Dimashova
722df6a998
minor change in doc
2012-07-13 06:00:30 +00:00
Maria Dimashova
7c211796e7
more doc details for #2152
2012-07-11 13:23:18 +00:00
Maria Dimashova
e68b26e71f
fixed doc #2152
2012-07-11 08:05:06 +00:00
Andrey Kamaev
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Andrey Kamaev
7e5726e251
Fixed several false-positive warnings in rst_parser.py. (Now it detects 553 undocumented parameters for #1205.)
2012-03-30 12:07:45 +00:00
Ilya Lysenkov
e7b4353505
Added termination criteria as a calibrateCamera() parameter
2012-03-29 17:19:15 +00:00
Ilya Lysenkov
ecbf9425e4
Added documentation of correctMaches ( #1350 )
2012-03-29 13:22:49 +00:00
Ilya Lysenkov
857676c610
Added documentation of triangulatePoints()
2012-03-29 11:54:29 +00:00
Andrey Kamaev
ec793df30f
#1205 fixed more bugs/typos in parameters
2012-03-29 08:07:57 +00:00
Andrey Kamaev
94c258cf15
#1205 fixed ~100 of ~700 parameters
2012-03-29 06:50:05 +00:00
Alexander Shishkov
5785a89053
fixed #1614
2012-02-21 04:42:34 +00:00
Vadim Pisarevsky
59ff1a4ccb
added StereoVar description (by Sergey Kosov)
2012-02-15 22:24:32 +00:00
Alexander Shishkov
bf747e6deb
modified documentation of solvePnP and solvePnPRansac
2012-01-10 16:01:06 +00:00
Alexander Shishkov
0922b3f3be
fixed Python description of estimateAffine3D function
2011-12-19 17:45:07 +00:00
Andrey Kamaev
d7a9b99b1d
Documentation: fixed references for C++ operators
2011-08-13 21:39:10 +00:00
Andrey Kamaev
d6e3ccc1b2
Documentation: fixed about 100 cross-referencing errors.
2011-08-13 16:49:40 +00:00
Andrey Kamaev
954f3c1eb9
Java: fixed Mats comparison; added resahpe mathod to core.Mat; fixed test resources extraction.
2011-07-28 12:13:11 +00:00
Vadim Pisarevsky
41df54e75f
fixed several typoes and errors in the refman (ticket #1203 )
2011-07-22 12:50:49 +00:00
Vadim Pisarevsky
f2e1a64c1b
fixed "import cv" in the new python samples. corrected Python bindings to match the documentation and vice versa (NOTE: in cv2.stereoCalibrate the parameter ordering has been changed)
2011-07-16 09:35:56 +00:00
Vadim Pisarevsky
5bb8076d7d
added centerPrincipalPoint=false to getOptimalNewCameraMatrix (ticket #1199 )
2011-07-07 21:38:21 +00:00
Vadim Pisarevsky
0940573e8b
fixed a few more typos in the docs.
2011-07-07 16:59:09 +00:00
Andrey Kamaev
ed8a2af9b6
Improved rst parser; fixed bug in hdr_parser; some small fixes in documentation
2011-07-07 14:49:24 +00:00
Andrey Kamaev
741a689f65
Improved RST parser; fixed small typos found by new parser
2011-07-07 11:23:51 +00:00
Vadim Pisarevsky
cc9a1bb62f
propagated some more fixes from 2.3 branch to the trunk
2011-06-30 12:06:26 +00:00
Bernat Gabor
762bc0f8af
Some reST syntax correction. Now the PDF documentation builds correctly under Windows using MIKTEX. Some update on the tutorial structure. Some CSS syntax correction. Windows Install Tutorial v0.4.
2011-06-30 00:41:41 +00:00
