Roman Donchenko
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
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
fd056235d3
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
2013-08-12 11:44:38 +02:00
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
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
Nghia Ho
bc3dd2452f
Added test cpp
2013-07-31 23:59:23 +10:00
Nghia Ho
00f63fa8f7
Finished test code, added image to the doc
2013-07-31 23:08:02 +10: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
abidrahmank
9628bb0b44
morphologyex docs bug#2169
2013-07-30 06:46:59 +05:30
Shervin Emami
7dc147c1f2
Changed cornerHarris description to say it finds corners, not edges
2013-07-26 19:13:25 -07:00
abidrahmank
692d807fa0
gabor filter docs Bug#1894
2013-07-20 00:15:28 +05:30
abidrahmank
a1ea1a7ec5
boxpoints documentation
2013-06-24 16:17:23 +05:30
Roman Donchenko
10340fe234
Merge pull request #949 from SpecLad:merge-2.4
2013-06-07 12:45:03 +04:00
IanVS
41fc41829c
Updated documentation to new "COLOR_" format for color conversion enums.
2013-06-05 21:59:01 -04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
abidrahmank
ca09ba6852
Bug #2960 : docs about CV_BGR2GRAY
2013-05-25 01:50:41 +05:30
abidrahmank
98960bf201
A new python sample on grabcut
2013-05-25 00:55:31 +05:30
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
Roman Donchenko
2dc8642508
Changed convexHull's documentation to essentially invert the meaning of `clockwise`.
...
The orientation of convexHull's result is currently the opposite of what the
documentation would suggest:
>>> import cv2, numpy as np
>>> points = np.array([[0,0],[0,1],[1,0]], dtype=np.int32)
>>> cv2.convexHull(points, clockwise=False)
array([[[1, 0]],
[[0, 1]],
[[0, 0]]], dtype=int32)
>>> cv2.convexHull(points, clockwise=True)
array([[[0, 0]],
[[0, 1]],
[[1, 0]]], dtype=int32)
Changing the function itself is probably not a good idea at this point, so
this fixes the documentation by flipping the coordinate system.
I also removed the mention of the origin, since it's irrelevant for this
function.
2013-04-26 14:22:55 +04:00
tim36272
5ef3ef9c4a
Clarified floodfill documentation
...
Clarified what value floodfill sets pixels in the mask to when FOODFILL_MASK_ONLY is set.
2013-04-17 00:34:20 -07: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
4846dcdfeb
Move borderInterpolate and copyMakeBorder documentation
2013-04-10 19:14:25 +04:00
Andrey Kamaev
befd696720
Update documentation
2013-04-08 15:47:29 +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
Fabrice Silva
eca114ae95
Fix definition of the covariance matrix of derivatives.
2013-02-26 18:50:20 +01:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Amro
42a2cb0a38
add description of ddepth param of cv::boxFilter
...
bug #2709
2013-02-13 15:16:17 +03:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Daniil Osokin
4c9c27b244
Fixed formula of YCrCb to RGB conversion (bug #2725 )
2013-01-28 18:29:01 +04:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Jason Newton
4cb25e9584
update documentation to latest connected components interface
2012-12-19 14:55:46 -08:00
Vsevolod Glumov
3f417f1ec3
Fixes for issues #2570 , #2492 , #2559 , #2489 , #2592 .
2012-12-14 10:49:51 +04:00
Jason Newton
85880397c4
connectedcomponents: use opencv integral types, add to docs, fix up things for a python export
2012-11-05 12:02:53 -08: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
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
2012-10-15 18:12:33 +04:00
Vadim Pisarevsky
57d9699058
added the note about 1-pixel border in findContours (relates to ticket #2362 )
2012-10-01 16:43:07 +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
Andrey Kamaev
b1eba01afb
Fixed several mistakes in documentation
2012-07-05 07:30:45 +00:00
Vadim Pisarevsky
87d1731714
added synonym CV_COMP_HELLIGNER for CV_COMP_BHATTACHARYAA to reflect the real formula used (bug report #2073 )
2012-06-22 15:12:19 +00:00
Vadim Pisarevsky
0c65ea976a
added the optional output maxima value to phaseCorrelate (patch #2071 by Robert Huitl)
2012-06-22 13:34:03 +00:00
Alexander Shishkov
e4d9d5294e
fixed #2047
2012-06-14 00:09:47 +00:00
Andrey Kamaev
40c779fcf5
phaseCorrelate documentation patch by Will Lucas #2017
2012-06-05 06:02:50 +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
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Andrey Kamaev
0e9e0a01db
Added new perf tests for boxFilter
2012-05-25 11:26:43 +00:00
Vadim Pisarevsky
159cc29bb5
fixed undistortPoints description (ticket #1964 )
2012-05-23 13:01:40 +00:00
Andrey Kamaev
3a1f85d4e8
Remerged the 2.4.0 branch
2012-05-02 20:20:14 +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
Andrey Pavlenko
aea24ffcd5
#796 , #1701 fixing doc vs code arg-s naming consistency
2012-03-30 14:22:34 +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
Vadim Pisarevsky
2598736ac2
added description of cv::convexityDefect
2012-03-29 19:56:53 +00:00
Andrey Kamaev
94c258cf15
#1205 fixed ~100 of ~700 parameters
2012-03-29 06:50:05 +00:00
Vadim Pisarevsky
e8fab91d51
added DIST_LABEL_PIXEL labelType to distanceTransform, ticket #1641 (thanks to Mikhail Matrosov for the patch)
2012-03-27 09:06:21 +00:00
Andrey Kamaev
4c58fff3f7
Added cvPyrUp signature to the documentation #1670
2012-03-26 13:01:10 +00:00
Vadim Pisarevsky
befa9b3109
fixed chi-square test, ticket #1263
2012-03-26 09:07:02 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Alexander Shishkov
d68311b9eb
fixed #1554
2012-03-13 12:24:05 +00:00
Alexander Shishkov
be63ce723f
#1672
...
updated links in cheatsheet
renamed directory for Mat tutorial
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +00:00
Andrey Kamaev
aeaae8b057
Updated rst configuration to read OpenCV version from sources; fixed several sphinx' warnings
2012-03-02 20:59:13 +00:00
Kirill Kornyakov
4fb9196e83
copied a section with explanation of different border types
2012-03-01 07:45:24 +00:00
Kirill Kornyakov
60eecd4529
doc typo fixed
2012-01-03 13:30:21 +00:00
Vadim Pisarevsky
8a9876bee2
corrected description of goodFeaturesToTrack (ticket #1488 )
2011-12-03 20:01:12 +00:00
Alexander Shishkov
d174c3db04
fixed compilation errors in TeX
2011-09-15 09:52:51 +00:00
Alexander Shishkov
d069396546
fixed problem in rst files
...
changed OpenCV version to 2.3.2
2011-09-15 08:31:14 +00:00
Vadim Pisarevsky
d77cf38896
corrected formula formatting in phaseCorrelate docs (thanks to the author for the patch)
2011-09-12 15:28:04 +00:00
Vadim Pisarevsky
32ed1bf858
added phaseCorrelate function by Will Lucas.
2011-09-05 07:57:18 +00:00
Andrey Kamaev
d6e3ccc1b2
Documentation: fixed about 100 cross-referencing errors.
2011-08-13 16:49:40 +00:00
Andrey Kamaev
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
Vadim Pisarevsky
cffd89f88f
added some missing declarations of the functions, noticed in the ticket ##229
2011-08-06 19:17:14 +00:00
Vadim Pisarevsky
d8417af086
fixed and improving formatting in opencv2refman.pdf. added support for n-channel mask in Mat::copyTo() and n-channel images in cv::compare(). fixed 2 compile warnings in opencv_python.
2011-07-24 10:34:14 +00:00
Andrey Kamaev
be2c4ddbdd
Android:
...
* Added manual port for getTextSize;
* Fixed bugs in "native camera" sample;
* Added 15-puzzle sample.
2011-07-16 22:31:47 +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
Andrey Kamaev
dfe7708f17
Improved javadoc comments generation scripts; fixed some typos in documentation
2011-07-11 13:33:05 +00:00
Vadim Pisarevsky
0940573e8b
fixed a few more typos in the docs.
2011-07-07 16:59:09 +00:00
Vadim Pisarevsky
5649f35757
some more bugfixed in 2.3 propagated to trunk
2011-07-07 11:43:21 +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
b33224f0b6
merged the latest fixes in 2.3 to trunk
2011-07-04 16:18:12 +00:00
Vadim Pisarevsky
a5d53e3e2f
some more corrections from Gabor
2011-07-01 12:09:39 +00:00
Vadim Pisarevsky
6c8a2b8888
propagated fixes in docs and cap_dshow to trunk
2011-07-01 09:39:22 +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
Vadim Pisarevsky
b204e73d9a
propagated some more fixes from 2.3 branch to the trunk
2011-06-29 22:06:42 +00:00
Vadim Pisarevsky
dacd265424
propagated some more fixes from 2.3 branch to the trunk
2011-06-29 22:04:43 +00:00
Vadim Pisarevsky
49467947ac
propagated some fixes from 2.3 to trunk
2011-06-23 12:00:09 +00:00
Vadim Pisarevsky
b1bf1deed0
fixed 2 bugs in reference manuals
2011-06-23 11:46:14 +00:00
Vadim Pisarevsky
2e54482de9
fixed formula in cvIntegral/integral description
2011-06-19 23:24:01 +00:00
Vadim Pisarevsky
8d8ef596c8
introduced new RST/Sphinx domain ocv.
2011-06-16 12:48:23 +00:00
Vadim Pisarevsky
79f3260b8e
fixed bayer pattern picture in cvtColor() description; corrected formula in getGaussianKernel()
2011-06-14 10:26:24 +00:00
Vadim Pisarevsky
20aca7440f
a lot of small corrections to bring down the number of undocumented functions, reported by the script; added em.cpp sample
2011-06-09 01:16:45 +00:00
Ilya Lysenkov
839c1bea4b
Fixed matchTemplate doc (ticket #1045 )
2011-06-08 15:37:49 +00:00
Ilya Lysenkov
35e25b760e
Added the EMD function description (ticket #696 )
2011-06-08 10:16:16 +00:00
Ilya Lysenkov
1e945dc984
Added documenation of the Earth Mover Distance (C++ interface, ticket #696 )
2011-06-08 10:08:24 +00:00
Vadim Pisarevsky
2d2b8a496e
renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122 )
2011-06-08 06:55:04 +00:00
