Roman Donchenko
|
f76dd99299
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
|
2013-08-19 19:02:36 +04:00 |
|
Dmitry Retinskiy
|
2765f3f7ad
|
Minor language corrections in the tutorial document
|
2013-08-09 10:32:34 +04:00 |
|
Alexander Shishkov
|
93200922fd
|
Fix bug with indices
|
2013-06-14 13:12:35 +04:00 |
|
Jonathan Bohren
|
221d610d55
|
calib3d model superscript should be subscript
|
2013-03-15 00:29:46 -03:00 |
|
Andrey Kamaev
|
0e7ca71dcc
|
Normalize whitespace in documentation and text files
|
2012-10-17 21:42:09 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Vsevolod Glumov
|
1f21b96b9d
|
Fixed the formulas, based on issue #2145
|
2012-10-11 03:26:23 +04:00 |
|
Bernat Gabor
|
df49158863
|
Added the "Camera calibration With OpenCV" tutorial. Extended with a few global links the conf.py file. Corrected an error in the linux_install.rst and one in the cascade_classifier.rst file.
|
2011-08-22 12:15:31 +00:00 |
|