StevenPuttemans
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
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
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
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
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
Michael Hanselmann
cdc2ee9789
Documentation fix for cv::compare (issue 3149)
...
Since commit d8417af086
2013-07-28 16:19:19 +02:00
Roman Donchenko
feaa12a274
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
Nikita Manovich
c55dc3e8ab
Fixed "FileStorage (minor) error in doc (Feature #3151 )"
...
It was just a typo in the documentation.
2013-07-11 16:06:25 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Vladislav Vinogradov
af2fc1a22a
added documentation for OpenGL interoperability
2013-06-20 16:11:10 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Alexander Smorkalov
8f7ba03ed2
Some fixes for incorrectly documented parameters identified by rst_parser.py (Bug #1205 )
2013-06-18 16:48:24 +04:00
Roman Donchenko
7a07f1a9e7
Merge pull request #899 from LeszekSwirski:fix-drawingdoc
2013-06-11 17:30:19 +04:00
IanVS
41fc41829c
Updated documentation to new "COLOR_" format for color conversion enums.
2013-06-05 21:59:01 -04:00
alex77git
445860d619
(typo)
2013-05-20 13:19:36 +02:00
Leszek Swirski
7542d66dbd
Fix drawing documentation referring to C API macros
2013-05-20 10:56:06 +01:00
alex77git
44a2b109b7
Bug #2967 , basic_structures.rst, fix 2 typos
2013-05-20 02:24:09 +02:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
e27f4da9c6
Merge pull request #795 from taka-no-me:move_imgproc_utils_to_core
2013-04-11 11:35:15 +04:00
Andrey Kamaev
4846dcdfeb
Move borderInterpolate and copyMakeBorder documentation
2013-04-10 19:14:25 +04:00
Andrey Kamaev
ad793ee3f4
Update documentation
2013-04-09 13:36:32 +04:00
Andrey Kamaev
befd696720
Update documentation
2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Andrey Kamaev
6ce050d264
Update docs
2013-04-03 14:10:03 +04:00
Ryan Rawson
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
2013-03-29 18:29:29 +04:00
Andrey Kamaev
0bb785c979
Merge pull request #717 from ryanobjc:patch-1
2013-03-29 18:21:59 +04:00
Ryan Rawson
0d49de51b7
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -
2013-03-27 02:52:53 -07:00
Andrey Kamaev
2edfae5070
Move documentation for cv::KeyPoint and cv::DMatch to core
2013-03-26 17:20:51 +04:00
Andrey Kamaev
33ef7990b0
Update documentation
2013-03-22 22:14:54 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
75513a46dc
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04: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
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
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Andrey Kamaev
16461247ce
Merge pull request #498 from asmorkalov:doc_ptr
2013-02-21 13:30:34 +04:00
Alexander
4091eab45e
cv::Ptr description extended.
2013-02-21 12:14:42 +04:00
Andrey Kamaev
11bd936f0b
Fix warnings from documentation build
2013-02-20 15:07:13 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
ff7b604a25
Fix several inconsistent declarations identified by check_doc2 script
2013-02-19 16:22:20 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Daniil Osokin
5f32e0e24d
Rewrote doc for set-get number of threads functionality with support new frameworks (bug #2064 )
2013-02-14 17:11:16 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Andrey Kamaev
992d47e9dc
Merge pull request #400 from ilysenkov:bugfix_2560
2013-02-01 12:05:48 +04:00
Ilya Lysenkov
b24e4bddb1
Documented the TermCriteria class ( #2560 )
2013-02-01 10:16:30 +04:00
Daniil Osokin
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Kirill Kornyakov
1c77f0abfe
Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator()
2012-11-01 22:28:46 +04:00
Andrey Kamaev
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
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
Andrey Kamaev
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
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
2012-10-15 20:01:44 +04:00
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
2012-10-15 18:12:33 +04:00
Vadim Pisarevsky
e365726c4a
fixed example of iteration through a SparseMat (bug #2310 )
2012-10-09 22:16:57 +04:00
Vadim Pisarevsky
e94cd1ec72
updated description of LineIterator with information about LineIterator::pos() (ticket #2338 )
2012-09-11 20:20:05 +04:00
Vadim Pisarevsky
0598f33a85
refactored command line parser, fixed the docs
2012-09-07 17:44:01 +04:00
AoD314
54a202b3d5
add new version of CommandLineParser. add empty docs
2012-09-07 13:24:48 +04:00
Vsevolod Glumov
037e3ee288
Fixed some minor formatting issues in 'old_basic_structures' and 'operations_on_arrays'.
2012-09-06 10:57:28 +04:00
Vsevolod Glumov
3d072dce02
Revert "Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'."
...
This reverts commit 907a9101eb
2012-09-06 10:38:03 +04:00
Vsevolod Glumov
907a9101eb
Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'.
2012-09-05 18:13:54 +04:00
Vsevolod Glumov
16717a8641
Partially cleaned 'operations_on_arrays' section of undocumented parameters.
2012-09-04 15:44:21 +04:00
Vadim Pisarevsky
e17b70e533
updated documentation with the new PCA functionality
2012-09-04 14:14:24 +04:00
Vsevolod Glumov
ce4ac2d74a
Cleaned 'old_basic_structures' of undocumented parameters.
2012-08-31 19:32:07 +04:00
Vsevolod Glumov
c78884c780
Improved 'Operations on Arrays" section of 'Core' module documentation.
2012-08-24 19:08:18 +04:00
Vsevolod Glumov
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Marina Kolpakova
33d95642d3
fixed documentation missmatch for polylines function
2012-07-08 18:26:18 +00:00
Vadim Pisarevsky
a1bc11c429
fixed typo in minMaxIdx description (ticket #2081 )
2012-07-02 12:59:02 +00:00
Andrey Kamaev
27c23b557c
Merged few small fixes from 2.4 branch
2012-06-30 13:36:27 +00:00
Andrey Kamaev
7b806f6008
fixed several documentation errors
2012-06-25 12:56:46 +00:00
Andrey Kamaev
a20248977c
Documentation: fixed class/struc members documentation; added warning on incorrectly documented member
2012-05-29 16:55:46 +00:00
Andrey Kamaev
40e8d08e8d
Added check for trailing semicolon to rst parser; fixed few documentation build warnings
2012-05-29 10:57:25 +00:00
Andrey Kamaev
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
Andrey Kamaev
6ca618277c
More fixes for documentation.
2012-05-28 20:11:38 +00:00
Vadim Pisarevsky
bc929a7d46
added API for storing OpenCV data structures to text string and reading them back
2012-05-28 15:38:58 +00:00
Andrey Kamaev
18a8721f49
Small fixes for documentation checking script
2012-05-28 15:29:21 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Andrey Kamaev
71625ad458
Fixed more documentation & source discrepancies
2012-05-28 11:22:43 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
513080ea12
some more fixes in Algorithm methods declarations
2012-05-24 11:50:54 +00:00
Vadim Pisarevsky
5cc4d23d1e
fixed description of cv::invert() (ticket #1972 )
2012-05-23 12:52:46 +00:00
Vadim Pisarevsky
01169ec826
fixed description of Algorithm::getList(); added sample, thanks to Shervin Emami (ticket #1972 )
2012-05-23 12:35:51 +00:00
Andrey Kamaev
0ba3236ce0
Fixed Algorithm usage example #1904
2012-05-17 10:52:07 +00:00
Vadim Pisarevsky
e794622776
propagated 2 fixed from 2.4 to trunk
2012-05-11 11:48:26 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
586ff429ec
fixed bug #1318 . extended RNG::fill with the optional saturateRange parameter
2012-03-29 12:00:34 +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
Vadim Pisarevsky
b6ab96ae0b
added special notice about the missing saturation in 32s case (ticket #1529 )
2012-03-27 14:58:46 +00:00
