Roman Donchenko
|
a3bde36c84
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
|
11 years ago |
Alexander Alekhin
|
964b260937
|
Merge pull request #2932 from ilya-lavrenov:tapi_other_vendors
|
11 years ago |
Ilya Lavrenov
|
2fe07abf83
|
use vectors for devices of all vendors
|
11 years ago |
|
Alexander Alekhin
|
d183554600
|
Merge pull request #2931 from alalek:mac_fix_master
|
11 years ago |
|
Alexander Alekhin
|
e6c305cb75
|
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
|
11 years ago |
|
Alexander Alekhin
|
c5d3c08256
|
ocl: add try-catch for OpenCL device getter
|
11 years ago |
|
Ilya Lavrenov
|
93f8581b69
|
fixed warnings
|
11 years ago |
|
Alexander Alekhin
|
effff27c4e
|
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
|
11 years ago |
|
Ilya Lavrenov
|
46e2216165
|
fixed cv::warpPerspective
|
11 years ago |
Vadim Pisarevsky
|
133d861d65
|
Merge pull request #2915 from SpecLad:core-useless-casts
|
11 years ago |
|
Vadim Pisarevsky
|
8539d424b2
|
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
|
11 years ago |
|
Vadim Pisarevsky
|
c3329ff79d
|
Merge pull request #2856 from sanchom:master
|
11 years ago |
|
Alexander Alekhin
|
dcf96b2da7
|
Merge pull request #2922 from ilya-lavrenov:mac_fix
|
11 years ago |
|
Vadim Pisarevsky
|
0e534b5a25
|
Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu
|
11 years ago |
|
Vadim Pisarevsky
|
d6233b13ba
|
Merge pull request #2913 from ilya-lavrenov:sse2_precornerdetect
|
11 years ago |
|
Alexander Alekhin
|
d65abcaedb
|
Merge pull request #2830 from mlyashko:moments
|
11 years ago |
|
Alexander Alekhin
|
b1ac35e14a
|
ocl: fix mac and superres test
|
11 years ago |
|
Ilya Lavrenov
|
43e4946cca
|
fix for fisheye
|
11 years ago |
|
Vadim Pisarevsky
|
1b18ebf28a
|
Merge pull request #2905 from Jazmann:2.4
|
11 years ago |
|
Vadim Pisarevsky
|
15197eb09b
|
Merge pull request #2911 from ilya-lavrenov:sse2_convert_scale_abs
|
11 years ago |
|
Vadim Pisarevsky
|
fe4bdcd71b
|
Merge pull request #2895 from fradelg:master
|
11 years ago |
|
Vadim Pisarevsky
|
f6cf68094f
|
Merge pull request #2917 from mmaraya:bug_3872
|
11 years ago |
|
Alexander Alekhin
|
6bb8c46d9a
|
Merge pull request #2906 from ilya-lavrenov:tapi_transpose
|
11 years ago |
|
Vadim Pisarevsky
|
d826bcdbbb
|
Merge pull request #2914 from alalek:fix2.4
|
11 years ago |
|
Ilya Lavrenov
|
070be56e14
|
fixed warnings
|
11 years ago |
|
Alexander Alekhin
|
157257b072
|
ocl: don't use OpenCL CPU device in default setup
|
11 years ago |
Mike Maraya
|
95550c2582
|
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782
|
11 years ago |
|
Ilya Lavrenov
|
972119bff3
|
sse2 optimization of cv::convertScaleAbs
|
11 years ago |
|
Ilya Lavrenov
|
54e4ef657c
|
optimized cv::transpose inplace
|
11 years ago |
|
Ilya Lavrenov
|
9c8b9fc733
|
cv::transpose
|
11 years ago |
|
Alexander Alekhin
|
cbd0511a56
|
Merge pull request #2907 from ilya-lavrenov:tapi_perf_transpose
|
11 years ago |
|
Ilya Lavrenov
|
978f7eb44a
|
added perf test for transpose inplace
|
11 years ago |
|
Roman Donchenko
|
ebb0255e19
|
Remove a couple of useless casts in core headers
This helps users who compile their code with -Wuseless-cast.
|
11 years ago |
|
Alexander Alekhin
|
5c8cd76893
|
fix bug with invalid signature size (should not be less than signatureLength())
|
11 years ago |
|
Alexander Alekhin
|
3a8af7d691
|
fix python tests
|
11 years ago |
|
Alexander Alekhin
|
acbabedac9
|
Merge pull request #2869 from ilya-lavrenov:tapi_warps
|
11 years ago |
|
Alexander Alekhin
|
e0584bb818
|
Merge pull request #2876 from vbystricky:oclopt_integralsum
|
11 years ago |
|
Alexander Alekhin
|
1493160f26
|
Merge pull request #2899 from ilya-lavrenov:tapi_ex
|
11 years ago |
|
Alexander Alekhin
|
b304868d91
|
Merge pull request #2886 from ilya-lavrenov:tapi_inrange
|
11 years ago |
|
Alexander Alekhin
|
667a9328fb
|
Merge pull request #2829 from ilya-lavrenov:tapi_cvtcolor
|
11 years ago |
|
Ilya Lavrenov
|
654bdde8ed
|
SSE2 optimization of cv::preCornerDetect
|
11 years ago |
|
Ilya Lavrenov
|
36db85a94d
|
optimized some operations
|
11 years ago |
|
Alexander Alekhin
|
2d81595ed4
|
Merge pull request #2852 from ilya-lavrenov:tapi_abs
|
11 years ago |
|
Roman Donchenko
|
e8850bf84a
|
Merge pull request #2626 from KayKwon:matlab_formatter
|
11 years ago |
|
Roman Donchenko
|
1576e24c93
|
Merge pull request #2672 from a-wi:findContours
|
11 years ago |
|
Roman Donchenko
|
e89e3066e8
|
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
|
11 years ago |
|
Roman Donchenko
|
1138fbb940
|
Merge pull request #2766 from akarsakov:pyr_border_constant
|
11 years ago |
|
Roman Donchenko
|
e9bb750d4e
|
Merge pull request #2858 from 23pointsNorth:patch-3
|
11 years ago |
|
Roman Donchenko
|
b0a70787e1
|
Merge pull request #2824 from abidrahmank:pylsd
|
11 years ago |
vbystricky
|
1a73aa1f6a
|
Change local size
|
11 years ago |
