Dmitriy Anisimov
|
1007c06d44
|
initial commit
|
2014-09-23 07:45:51 +04:00 |
|
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 |
|
Martin Jul
|
73042b32e1
|
Fixed typos in "matching"
|
2014-03-26 23:29:48 +01:00 |
|
John Stowers
|
4b19fda1d6
|
Add brisk features to python demos
|
2013-09-20 21:12:49 +02: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
|
57d4c86b2b
|
Fixed the shebang lines on the Python scripts.
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
|
2013-04-11 18:37:23 +04:00 |
|
Moshe Kaplan
|
bd042d9cc3
|
Fixed shebangs, added error checking
|
2013-03-06 01:41:02 -05:00 |
|
marina.kolpakova
|
285d6320be
|
add #/usr/bin/env python to all python files
|
2012-11-23 22:57:22 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Alexander Mordvintesv
|
0f9bbf85e5
|
spelling corrections, added aero images as a more impressive example for
ASIFT
|
2012-07-29 16:26:22 +03:00 |
|
Alexander Mordvintsev
|
ea96047f78
|
small doc fix
|
2012-07-16 14:17:39 +00:00 |
|
Alexander Mordvintsev
|
200357fdf4
|
window name changed
|
2012-07-16 14:16:36 +00:00 |
|
Alexander Mordvintsev
|
3ce5b01543
|
added asift.py sample
|
2012-07-16 12:29:49 +00:00 |
|