Roman Donchenko
|
f77c68e0fa
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
|
2014-03-31 14:42:00 +04:00 |
|
yash
|
51cb6998ea
|
made the example consistent with the fuction definition and improved doc
made the example consistent with the fuction definition and improved doc
|
2014-03-17 18:44:02 +05:30 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +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
|
ce4ac2d74a
|
Cleaned 'old_basic_structures' of undocumented parameters.
|
2012-08-31 19:32:07 +04: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
|
05de6302fd
|
Fixed documentation: corrected parameter names
|
2012-05-29 10:36:19 +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
|
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 Kamaev
|
d6e3ccc1b2
|
Documentation: fixed about 100 cross-referencing errors.
|
2011-08-13 16:49:40 +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 |
|
Vadim Pisarevsky
|
569b1ad582
|
embeded cv Python module into cv2.
|
2011-07-12 12:56:03 +00:00 |
|
Vadim Pisarevsky
|
5649f35757
|
some more bugfixed in 2.3 propagated to trunk
|
2011-07-07 11:43:21 +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
|
b204e73d9a
|
propagated some more fixes from 2.3 branch to the trunk
|
2011-06-29 22:06:42 +00:00 |
|