Roman Donchenko
|
78be4f66f7
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
|
2013-10-28 13:38:25 +04:00 |
|
Samuel Wejéus
|
eddaaa9643
|
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
|
2013-10-24 10:36:01 +02:00 |
|
Roman Donchenko
|
9ed475cf52
|
War on Whitespace, master edition: file endings.
|
2013-08-27 14:23:26 +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
|
3c137f7a04
|
Converted tabs to spaces.
|
2013-08-21 18:59:26 +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 |
|
Andrey Kamaev
|
0e7ca71dcc
|
Normalize whitespace in documentation and text files
|
2012-10-17 21:42:09 +04:00 |
|
Vadim Pisarevsky
|
36dacc688a
|
removed non-existing CoreAnimation framework from the list of required frameworks (bug #2326)
|
2012-09-06 14:22:40 +04:00 |
|
Vadim Pisarevsky
|
283087dd56
|
fixed typo (bug #2327)
|
2012-09-06 14:16:18 +04:00 |
|
Vadim Pisarevsky
|
a6e2acbfee
|
added a few missing images for tutorials; integrated pull request #26
|
2012-08-30 16:23:18 +04:00 |
|
Vadim Pisarevsky
|
3d4ca2d709
|
added ios tutorials by Charu Hans and Eduard Feicho
|
2012-08-30 15:49:53 +04:00 |
|