79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
092f916db9
Revert 4f9c081
...
That commit introduces problems, as it breaks certain use cases of
OpenCV functions; for example, convertTo of an Nx1 matrix to an
std::vector.
Since vectors can't store separate width and height values, OpenCV
considers them to always be 1xN. So even though the vector is created with
.create(N, 1), the Mat passed to getContinousSize has dimensions 1xN,
and the size comparison fails, even though the operation itself is safe.
This is a use case we probably don't want to break, at the very least
for backwards compatibility. So I'm reverting the commit. This will also
unfix bug #3319 ; I'll submit a less intrusive solution as a PR to 2.4, which
will also revert 4f9c081
2014-01-17 12:51:52 +04:00
93a818684c
ported cv::Canny to T-API
2014-01-17 11:13:28 +04:00
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
fdb1019b9e
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt
2014-01-14 11:34:03 +04:00
09bff78d63
deleted extra arg in case of power=0.5
2014-01-13 19:59:10 +04:00
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
2014-01-13 16:30:33 +04:00
6071671bda
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2
2014-01-11 17:15:22 +04:00
da2790249e
added NORM_L2SQR type to cv::norm
2014-01-10 18:45:52 +04:00
a01e81c8f7
added some performance tests
2014-01-10 18:45:40 +04:00
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +04:00
f7b0940d44
core/ocl: runtime, remove unused declarations
2014-01-10 11:42:02 +04:00
dd302158e0
fixed case with zero mask
2014-01-09 19:26:09 +04:00
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
6ee0b6eb56
added mask support to cv::norm, cv::meanStdDev
2014-01-09 13:49:42 +04:00
70a0327004
core/ocl: cleanup unused files
2014-01-09 13:47:04 +04:00
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
0119e8553c
fixed cv::mixChannels OpenCL version
2014-01-06 14:41:57 +04:00
3a4d4080f4
fixed overflow for cv::norm NORM_L2
2014-01-04 15:20:50 +04:00
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
2013-12-31 00:35:39 +04:00
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
2013-12-31 00:26:22 +04:00
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
2013-12-31 00:17:33 +04:00
3e1bec5248
added OpenCL version of cv::patchNaNs
2013-12-30 19:53:03 +04:00
a2e683d133
fixed umat access
2013-12-30 19:37:20 +04:00
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
2013-12-30 17:57:43 +04:00
1312eca220
Merge commit '0566ab4d3d' into merge-2.4
...
Conflicts:
modules/core/src/system.cpp
2013-12-30 16:51:46 +04:00
09d25e11c6
fixed bug #3341
2013-12-30 16:47:54 +04:00
55634c1f52
fix
2013-12-30 13:06:32 +04:00
44970ddf56
eliminate MINGW pragma warning
2013-12-30 12:31:00 +04:00
6b64257c81
added OpenCL version of cv::scaleAdd
2013-12-29 18:46:25 +04:00
abcf8d9e61
implemented OpenCL version of cv::convertScaleAbs
2013-12-29 18:01:19 +04:00
4a6c2ce378
Merge pull request #2081 from ilya-lavrenov:tapi_perf
2013-12-28 22:06:12 +04:00
dbaf125fcd
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
2013-12-28 22:05:49 +04:00
2d2312d742
Merge pull request #2077 from ilya-lavrenov:tapi_context
2013-12-27 20:23:57 +04:00
31e6251793
added new perf tests to core
2013-12-27 20:02:12 +04:00
df63060e4d
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
2013-12-27 18:04:10 +04:00
f221f57c7c
this commit prevents segfaults in case of opencl disabled
2013-12-27 14:02:03 +04:00
73c96cbd50
some fixes of cv::mixChannels
2013-12-27 13:59:55 +04:00
2eab07f0a4
disabled cv::dft opencl impl for CPU devices
2013-12-27 13:39:29 +04:00
a7d2830d3f
added cv::mixChannels to T-API
2013-12-27 13:14:37 +04:00
c45492371a
Merge pull request #2036 from GregoryMorse:patch-1
2013-12-27 12:44:02 +04:00
4644a864a5
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
2013-12-26 20:37:34 +04:00
fd6a74496b
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
2013-12-26 19:38:01 +04:00
c8a52daafd
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
2013-12-26 17:27:06 +04:00
fc1f9ab236
removed unnecessary data copying
2013-12-26 17:13:26 +04:00
d64bea00b2
ported cv::calcBackProject to T-API
2013-12-26 14:58:50 +04:00
1e038e2837
CUDA warning fix/supporession for Android.
2013-12-26 10:17:38 +04:00
Roman Donchenko