Roman Donchenko
|
9ed475cf52
|
War on Whitespace, master edition: file endings.
|
2013-08-27 14:23:26 +04:00 |
|
Roman Donchenko
|
9b92545ce6
|
War on Whitespace, master edition: trailing spaces.
|
2013-08-27 13:57:24 +04:00 |
|
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 |
|
Roman Donchenko
|
f55740da70
|
Deleted all trailing whitespace.
|
2013-08-21 18:59:24 +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 |
|
Andrey Pavlenko
|
1c55096c01
|
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
|
2013-08-07 21:05:43 +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
|
95bdd4b670
|
Merge pull request #1189 from pengx17:2.4_sort_by_key
|
2013-08-07 11:41:23 +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 |
|
peng xiao
|
8b90cb375a
|
Fix doc build error.
|
2013-07-30 14:12:22 +08:00 |
|
peng xiao
|
892c088e1b
|
Some modifications to sortByKey API.
Add documentation.
|
2013-07-30 11:53:25 +08:00 |
|
yao
|
3d3e9ab635
|
Fix the problem of haar caused by merge
|
2013-07-22 17:53:56 +08:00 |
|
peng xiao
|
143f8f69d6
|
Add some documentation on ocl::convolve
|
2013-04-08 17:15:52 +08:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Andrey Kamaev
|
4bd721ad3b
|
Fix build errors
|
2013-03-21 18:37:34 +04:00 |
|
Andrey Kamaev
|
891d7da6ee
|
Merge branch '2.4'
|
2013-02-28 11:17:06 +04:00 |
|
hgaspar
|
60981565fa
|
updated the ocl module introduction
|
2013-02-24 22:34:44 -05:00 |
|
Andrey Kamaev
|
b44b920997
|
Merge branch '2.4'
|
2013-02-12 16:30:18 +04:00 |
|
yao
|
568b935246
|
remove a warning on Linux
fix a error in doc
|
2013-02-05 17:16:40 +08:00 |
|
Andrey Kamaev
|
f3f55b30b0
|
Merge pull request #267 from pclove1:ocl_hough
|
2013-01-19 12:02:14 +04:00 |
|
Suenghoon Park
|
06da75ffe0
|
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
|
2013-01-15 12:21:25 -05: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 |
|
Suenghoon Park
|
8a1d6a1bb2
|
added documentation for ocl::HoughCircles
|
2012-12-26 17:40:26 -05:00 |
|
Andrey Kamaev
|
b401c6a0c3
|
Fix discrepancies between function signatures in headers and documentation
|
2012-12-26 18:24:50 +04:00 |
|
Vadim Pisarevsky
|
849a8c8d20
|
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
|
2012-10-31 15:15:51 +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
|
8aa2d6cddc
|
Fix several documentation build warnings
|
2012-08-07 18:00:09 +04:00 |
|
Vadim Pisarevsky
|
9f4efab40a
|
merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)
|
2012-07-16 17:08:14 +00:00 |
|