Roman Donchenko
|
95a55453df
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
|
2014-03-11 17:20:01 +04:00 |
|
Ilya Lavrenov
|
099ea91823
|
typos
|
2014-03-04 12:47:40 +04:00 |
|
Ilya Lavrenov
|
78c2b3ca2a
|
refactored imgproc
|
2014-01-27 18:47:16 +04:00 |
|
Ilya Lavrenov
|
93a818684c
|
ported cv::Canny to T-API
|
2014-01-17 11:13:28 +04:00 |
|
Alexander Karsakov
|
6ef0253fb7
|
Disabled some IPP implementation since it breaks tests
|
2013-12-26 19:53:53 +04:00 |
|
Ilya Lavrenov
|
036e99d03a
|
fixed ipp-related warnings
|
2013-10-05 14:54:00 +04:00 |
|
Vadim Pisarevsky
|
771feb61c2
|
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
|
2013-08-28 17:00:26 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Andrey Kamaev
|
ff2af7d8bb
|
Fixed Canny
|
2012-02-21 11:16:49 +00:00 |
|
Vadim Pisarevsky
|
bb93e3ab8a
|
added color canny; improved Algorithm class implementation
|
2012-02-15 21:10:11 +00:00 |
|
Andrey Kamaev
|
4136855ba8
|
Tegra-optimized Canny
|
2011-11-11 14:45:53 +00:00 |
|
Vadim Pisarevsky
|
0c877f62e9
|
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
|
2011-06-06 14:51:27 +00:00 |
|
Vadim Pisarevsky
|
abeeb40d46
|
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
|
2011-04-17 13:14:45 +00:00 |
|
Vadim Pisarevsky
|
6cd01dc6ca
|
mapstep type was also changed to ptrdiff_t (ticket #157)
|
2010-11-15 20:59:09 +00:00 |
|
Vadim Pisarevsky
|
1fce36a164
|
try to make a more elegant workaround for the incorrectly generated code in Canny (ticket #157)
|
2010-11-15 20:53:33 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|