2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
92d04d439e
docs changes
2013-08-13 21:58:49 +05:30
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
297b67d2b1
pydocs for cv2.findTransformECC
2013-07-21 13:40:11 +05:30
84179b8a4e
bgdsubtractorGMG docs
2013-07-19 23:11:30 +05:30
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
6b71f56025
minor typo in the research paper title
2013-04-04 15:58:11 +05:30
6ce050d264
Update docs
2013-04-03 14:10:03 +04:00
d310ccad0a
fixed documentation and warnings on Windows
2013-03-21 20:23:52 +04:00
09127aa358
fixed warnings; added read/write methods; fixed docs
2013-03-21 15:46:21 +04:00
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
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
f40725bb50
Add ECC algorithm
...
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
2bbb777d95
Fix warnings about missing parent for class members
2013-02-19 11:49:05 +04:00
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
a3a09cf4d1
refactored OpticalFlowDual_TVL1:
...
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
1498d2f427
added dual tvl1 optical flow implementation
2013-02-13 15:42:58 +04:00
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
52a136227d
Modified documentation for calcOpticalFlowSF.
2012-11-14 14:27:41 +04:00
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
73bbabf207
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-18 13:03:12 +04:00
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
1fde184192
Small fixes for SimpleFlow algorithm
...
+ Fixed warnings
+ Add new function calcOpticalFlow with smaller number of arguments
+ Add asserts to algorithm and remove 'exit(1)'
2012-08-31 14:39:59 +04:00
c77d099018
"SimpleFlow" optical flow estimation algorithm (GSoC project) declaration in includes, implementation, usage example, test
2012-08-31 14:39:58 +04:00
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
88c934ea8c
Added documentation for buildOpticalFlowPyramid
2012-05-23 08:50:43 +00:00
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
94c258cf15
#1205 fixed ~100 of ~700 parameters
2012-03-29 06:50:05 +00:00
d7a9b99b1d
Documentation: fixed references for C++ operators
2011-08-13 21:39:10 +00:00
d6e3ccc1b2
Documentation: fixed about 100 cross-referencing errors.
2011-08-13 16:49:40 +00:00
431daf59b6
* Fixed cross-referencing in reference manual (except C++ operator() ).
...
* Fixed display of struct and class definitions (except classes with base class specified).
* Fixed formatting and referencing errors in several documentation files.
2011-08-12 22:18:04 +00:00
cffd89f88f
added some missing declarations of the functions, noticed in the ticket ##229
2011-08-06 19:17:14 +00:00
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
848fa23a07
made boundingRects argument of segmentMotion CV_OUT
...
updated documentation
2011-07-11 07:51:15 +00:00
741a689f65
Improved RST parser; fixed small typos found by new parser
2011-07-07 11:23:51 +00:00
cc9a1bb62f
propagated some more fixes from 2.3 branch to the trunk
2011-06-30 12:06:26 +00:00
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
Roman Donchenko