Vadim Pisarevsky
5505aa28ce
Merge pull request #3078 from vpisarev:refactor_features2d_take3
2014-08-12 13:56:17 +00:00
Alexander Alekhin
da806cc3e7
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
2014-08-12 10:21:41 +00:00
vbystricky
6fb282aa39
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result
2014-08-12 11:25:23 +04:00
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
Alexander Alekhin
8fd61c9aa6
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
2014-08-11 15:02:53 +00:00
Elena Gvozdeva
b73b28ab9c
fix for ocl_lut
2014-08-11 16:21:55 +04:00
vbystricky
dfe5fff2f5
Restore OpenCL branch for minmaxLoc on float data
2014-08-11 15:57:29 +04:00
Alexander Karsakov
835b5e2179
Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30.
2014-08-11 15:50:06 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
9ef373f6a5
Merge pull request #3038 from yury-gorbachev:core_arithm_neon
2014-08-10 20:20:04 +00:00
Vadim Pisarevsky
4de4ff5682
Merge pull request #3067 from vpisarev:minor_fixes2
2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Yury Gorbachev
9a233999a9
Fixed review comment from Vadim Pisarevsky
2014-08-09 13:37:53 +04:00
Vadim Pisarevsky
09907eeb62
Merge pull request #2639 from kazuki-ma:cv_mat_foreach
2014-08-09 08:25:05 +00:00
Vadim Pisarevsky
99eed2d885
Merge pull request #3057 from Adil-Ibragimov:adding-constness
2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
74457cd3b5
Merge pull request #3055 from akarsakov:copyto_UMat_fix
2014-08-08 14:20:02 +00:00
Vadim Pisarevsky
88672f414b
Merge pull request #3056 from akarsakov:ocl_setIdentity_fix
2014-08-08 14:03:46 +00:00
Alexander Karsakov
6ad4521b78
Fixed typos
2014-08-08 13:11:35 +04:00
Adil Ibragimov
8dab2ffce7
fixing error, wrong template method param.
2014-08-07 17:43:32 +04:00
Adil Ibragimov
6b05ca589d
fixing Mac build
2014-08-07 17:06:22 +04:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Karsakov
c5ad6de596
Fixed choice of kercn and rowsPerWI for non-Intel device.
2014-08-07 15:37:26 +04:00
Alexander Karsakov
00221e96fd
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
2014-08-07 13:16:02 +04:00
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
d611684d9e
Merge pull request #3041 from adrians:optimize_split
2014-08-06 09:22:38 +00:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Alexander Alekhin
d2f1c00719
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
2014-08-05 14:52:22 +00:00
vbystricky
774d277c1f
Fix error in OpenCl version of meanstddev for continues src and not continues mask
2014-08-05 17:30:06 +04:00
vbystricky
2637b18b67
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
2014-08-05 16:34:23 +04:00
Adrian Stratulat
b2acd1f75a
Vectorize split & merge for NEON
2014-08-05 06:51:36 +00:00
Vadim Pisarevsky
a05ce00a65
Merge pull request #2879 from alalek:ocl_runtime_flags
2014-08-04 16:43:01 +00:00
Vadim Pisarevsky
a58767eff8
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
2014-08-04 14:54:12 +00:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Yury Gorbachev
61423a2d47
ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions.
...
NOT verified on target platform, compilation passes with and without NEON.
2014-08-04 16:44:51 +04:00
vbystricky
2d587ad691
Prevent generating test case with mask filled 0 only
2014-08-04 15:12:36 +04:00
Alexander Alekhin
add9ce46c3
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
2014-08-04 08:09:38 +00:00
Vadim Pisarevsky
28ca6ac05e
fixed building html docs
2014-08-03 02:34:47 +04:00
VBystricky
2026094691
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
2014-08-02 13:21:34 +04:00
Alexander Alekhin
11dd36f3aa
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
2014-08-01 17:15:53 +00:00
vbystricky
aad4104297
Fix accurency test for OpenCL matrix operations
2014-08-01 18:30:20 +04:00
vbystricky
184c5917bf
Fix accurency test of OpenCL merge function.
2014-08-01 17:53:24 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
vbystricky
b48e487d53
Enable ocl version of minmaxloc with mask
2014-07-31 19:12:10 +04:00
vbystricky
11a0e3ff78
Fix error in OCL minmaxloc
2014-07-31 19:04:38 +04:00
Elena Gvozdeva
9db8592aa8
fixed ocl_flip for cn==3
2014-07-31 16:57:47 +04:00
Vadim Pisarevsky
b0cd822924
trying to make the tests pass
2014-07-31 14:24:21 +04:00
Vadim Pisarevsky
ef8647fe30
put IPP ReduceSum_32f back
2014-07-30 19:12:11 +04:00
