Vadim Pisarevsky
|
bc730292bb
|
workaround for some strange bug on old Mac.
|
2013-12-23 21:29:31 +04:00 |
|
Andrey Pavlenko
|
0966e5ffa1
|
Merge pull request #2033 from ilya-lavrenov:tapi_normalize
|
2013-12-23 19:19:00 +04:00 |
|
Ilya Lavrenov
|
e3d23918fa
|
added cv::normalize to T-API; implemented missed UMat::copyTo with mask
|
2013-12-23 19:17:35 +04:00 |
|
Andrey Pavlenko
|
6a2fb8e5d1
|
Merge pull request #2041 from ilya-lavrenov:tapi_mul_div
|
2013-12-23 19:09:59 +04:00 |
|
Roman Donchenko
|
3c4b24d531
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
|
2013-12-23 18:50:17 +04:00 |
|
Vadim Pisarevsky
|
8998186ce4
|
removed extra whitespaces and hopefully fixed the test failures
|
2013-12-23 18:41:54 +04:00 |
|
Roman Donchenko
|
edce617a58
|
Merge pull request #2040 from asmorkalov:android_mk_fix
|
2013-12-23 18:02:18 +04:00 |
|
Alexander Smorkalov
|
51d3138dff
|
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
|
2013-12-23 16:40:31 +04:00 |
|
Roman Donchenko
|
83cdd43a4c
|
Merge pull request #2039 from asmorkalov:ocv_version_inc3
|
2013-12-23 15:53:11 +04:00 |
|
Vadim Pisarevsky
|
d084d19779
|
added OpenCL optimization for LBP-based face detector
|
2013-12-23 15:28:50 +04:00 |
|
Andrey Pavlenko
|
06e981f1ce
|
Merge pull request #2035 from ilya-lavrenov:tapi_CamShift
|
2013-12-23 13:00:22 +04:00 |
|
Alexander Smorkalov
|
58e7d9f32f
|
OpenCV.mk fixed for accurate CUDA support.
|
2013-12-23 12:58:12 +04:00 |
|
Roman Donchenko
|
f22d9a232d
|
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
|
2013-12-23 12:45:49 +04:00 |
|
Alexander Smorkalov
|
4ec1930949
|
OpenCV version++; OpenCV Manager version++.
|
2013-12-23 12:35:06 +04:00 |
|
Alexander Smorkalov
|
bc72f4d2a2
|
Code review fixes.
|
2013-12-23 11:34:46 +04:00 |
|
GregoryMorse
|
08d8faf9da
|
Update system.cpp
Add native C++ support
|
2013-12-23 00:21:51 +08:00 |
|
Ilya Lavrenov
|
febb200eee
|
fixed cv::multuply, cv::divide
|
2013-12-22 15:49:36 +04:00 |
|
Ilya Lavrenov
|
6083efc111
|
refactored cv::CamShift and cv::meanShift
|
2013-12-21 14:40:59 +04:00 |
|
Andrey Pavlenko
|
f9268d34dc
|
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
|
2013-12-21 12:44:06 +04:00 |
|
Andrey Pavlenko
|
b29835a8f8
|
Merge pull request #2030 from LeszekSwirski:fix-imgproc-ipp
|
2013-12-20 21:39:10 +04:00 |
|
Andrey Pavlenko
|
a49211a77e
|
Merge pull request #2032 from ilya-lavrenov:tapi_mulSpectrums
|
2013-12-20 21:38:14 +04:00 |
|
Ilya Lavrenov
|
c33a7cd7bf
|
added cv::mulSpectrums to T-API
|
2013-12-20 18:41:20 +04:00 |
|
Vadim Pisarevsky
|
1540910542
|
started adding OpenCL acceleration of LBP-based object detectors
|
2013-12-20 18:39:35 +04:00 |
|
Andrey Pavlenko
|
14782194f4
|
Merge pull request #1995 from akarsakov:ocl_pyramids
|
2013-12-20 17:57:09 +04:00 |
|
Roman Donchenko
|
b0ec7dafd8
|
Merge pull request #1950 from GregoryMorse:patch-2
|
2013-12-20 17:54:02 +04:00 |
|
Roman Donchenko
|
6e22be4100
|
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
|
2013-12-20 17:06:27 +04:00 |
|
Roman Donchenko
|
ce07840e9f
|
Merge pull request #1966 from asmorkalov:ocv_neon_support
|
2013-12-20 17:04:17 +04:00 |
|
Andrey Pavlenko
|
6b7d890f34
|
Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
|
2013-12-20 16:50:00 +04:00 |
|
Leszek Swirski
|
9c22d4887c
|
imgproc: IPP compilation fix and minor cleanup
|
2013-12-20 12:40:40 +00:00 |
|
Alexander Smorkalov
|
9941c6710d
|
NEON instruction set control unified for regular and cross-compiler builds.
|
2013-12-20 16:02:37 +04:00 |
|
krodyush
|
e8dd31aacd
|
change code according reviewer suggesions
|
2013-12-20 13:51:51 +04:00 |
|
Vladimir Bystricky
|
d6a7e8f84f
|
Remove TBB ifdef form code
|
2013-12-20 12:33:39 +04:00 |
|
Roman Donchenko
|
b4bd5bab6d
|
Merge pull request #2021 from vpisarev:ocl_facedetect7
|
2013-12-20 12:30:49 +04:00 |
|
Roman Donchenko
|
b633c73c46
|
Merge pull request #1994 from StevenPuttemans:bugfix_3431
|
2013-12-20 11:57:30 +04:00 |
|
Alexander Smorkalov
|
529bd41751
|
Build fixes for case where HAVE_CUDA==OFF.
|
2013-12-20 11:37:15 +04:00 |
|
krodyush
|
27c1bd2762
|
Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
new performance tests were added
|
2013-12-19 22:56:46 +04:00 |
|
Andrey Pavlenko
|
cdffa05c27
|
Merge pull request #2019 from ilya-lavrenov:tapi_repeat
|
2013-12-19 19:28:58 +04:00 |
|
Alexander Smorkalov
|
069f3d8d9a
|
Build fixes for GPU module.
|
2013-12-19 19:12:18 +04:00 |
|
Alexander Smorkalov
|
2509fa8080
|
Warious fixes for case where HAVE_CUDA==OFF.
|
2013-12-19 18:02:59 +04:00 |
|
Alexander Smorkalov
|
5a5c82bb1d
|
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.
|
2013-12-19 17:41:04 +04:00 |
|
Alexander Karsakov
|
febe528363
|
Added ocl::pyrUp to T-API
|
2013-12-19 17:21:50 +04:00 |
|
Andrey Pavlenko
|
26f5d2d639
|
Merge pull request #1765 from ilya-lavrenov:cv_remap
|
2013-12-19 17:08:52 +04:00 |
|
Vadim Pisarevsky
|
242a3d1f19
|
2 more fixes to calm down the doc builder
|
2013-12-19 16:57:02 +04:00 |
|
Andrey Pavlenko
|
dde1d6b636
|
Merge pull request #2018 from ilya-lavrenov:tapi_dft
|
2013-12-19 16:47:19 +04:00 |
|
Andrey Pavlenko
|
b674cd8571
|
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
|
2013-12-19 16:46:58 +04:00 |
|
Andrey Pavlenko
|
8c91a1af71
|
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
|
2013-12-19 16:46:40 +04:00 |
|
Alexander Smorkalov
|
037ffcdf99
|
Dynamic CUDA support library reimplemented as OpenCV module.
|
2013-12-19 16:42:11 +04:00 |
|
Vadim Pisarevsky
|
f41f633d2d
|
fixed various warnings from the “doc” and other builders
|
2013-12-19 16:31:30 +04:00 |
|
Andrey Pavlenko
|
22a3cf0fba
|
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
|
2013-12-19 16:14:42 +04:00 |
|
Vadim Pisarevsky
|
a1784b7320
|
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
|
2013-12-19 14:48:42 +04:00 |
|