0d702b83f4
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
2014-01-19 18:38:51 +04:00
7b28f730f4
traits for Affine3
2014-01-19 18:38:47 +04:00
a76a34d28e
added Affine3: 3x4 input Mat support
2014-01-19 18:38:46 +04:00
3e071491c9
added Affine3 ctor from array
2014-01-19 18:38:46 +04:00
b1c0bf1fee
Affine::rotate(rvec) method
2014-01-19 18:38:45 +04:00
7e952e2f10
removed incorrect and unnecessarily methods from Affine3f
2014-01-19 18:38:43 +04:00
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
2e5e278271
added cv::PSNR performance test
2014-01-10 18:45:40 +04:00
a01e81c8f7
added some performance tests
2014-01-10 18:45:40 +04:00
1592234f1a
added mask support to cv::norm, cv::meanStdDev
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
a75cfe13e7
Merge pull request #2128 from alalek:ocl_cleanup_runtime
2014-01-09 17:08:48 +04:00
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
9899cf7519
fixed cv::mixChannels perf test
2014-01-09 14:26:44 +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
7acea48788
Merge pull request #2106 from robbertkl:patch-2
2014-01-09 13:25:59 +04:00
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
2014-01-09 12:41:57 +04:00
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +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
2ae20c74a2
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
...
Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.
First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113
2014-01-06 02:24:14 +09: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
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
2013-12-31 15:55:00 +04:00
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
cd576c7364
Merge pull request #2096 from kamjagin:master
2013-12-31 11:53:25 +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
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
2013-12-30 17:00:17 +01:00
8151571dd6
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
2013-12-30 19:54:27 +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
7f795e964f
Merge commit 'ee36717d' into merge-2.4
2013-12-30 16:49:39 +04:00
09d25e11c6
fixed bug #3341
2013-12-30 16:47:54 +04:00
Anatoly Baksheev