Vladislav Vinogradov
|
cbe437571e
|
fixed docs
|
2013-09-02 14:00:44 +04:00 |
|
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 |
|
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 |
|
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
|
031c77f4eb
|
SIFT+SURF PyDocs
|
2013-07-11 09:30:21 +05:30 |
|
Vladislav Vinogradov
|
49a4f27d42
|
removed VIBE implementation
|
2013-05-17 11:27:00 +04:00 |
|
Vladislav Vinogradov
|
ec52096e30
|
removed VIBE implementation
|
2013-05-16 13:47:24 +04:00 |
|
Andrey Kamaev
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
4bd721ad3b
|
Fix build errors
|
2013-03-21 18:37:34 +04:00 |
|
Vladislav Vinogradov
|
0a65f2f4af
|
merged gpunonfree and nonfree module
|
2013-03-18 16:14:37 +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 |
|
Vincent Rabaud
|
185673e9e2
|
backoprt 8987
|
2012-07-10 19:09:25 +00:00 |
|
Andrey Kamaev
|
81a5988015
|
Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)
|
2012-05-30 11:13:07 +00:00 |
|
Vadim Pisarevsky
|
7a3b351357
|
added documentation for ORB (ticket #1835). updated documentation on features2d (Feature2D class is still to be documented) (ticket #1819)
|
2012-04-28 17:32:02 +00:00 |
|
Ilya Lysenkov
|
2f44610ef3
|
Mentioned in doc if a function is parallelized with the TBB library (issue #421)
|
2012-04-13 15:31:18 +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 |
|