cc514ac7a9
added new macros useful for tracking whether OpenCL impl run or not
2014-01-24 17:16:40 +04:00
9710b25c7d
Merge pull request #2173 from Nerei:viz
2014-01-20 18:05:11 +04:00
ac035b9b8e
review comments
2014-01-20 15:22:58 +04:00
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
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +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
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +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
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +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
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
2013-12-31 15:55:00 +04:00
cd576c7364
Merge pull request #2096 from kamjagin:master
2013-12-31 11:53:25 +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
55634c1f52
fix
2013-12-30 13:06:32 +04:00
c4c913ff13
converted CPU-based example to T-API (Mat 2 UMat, etc)
2013-12-30 03:19:17 +04:00
217b2282b8
fixes
2013-12-26 03:06:58 +04:00
e49065b1dc
core/ocl: temporary move device selection from ocl module
2013-12-25 16:17:40 +04:00
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
b4bd5bab6d
Merge pull request #2021 from vpisarev:ocl_facedetect7
2013-12-20 12:30:49 +04:00
dde1d6b636
Merge pull request #2018 from ilya-lavrenov:tapi_dft
2013-12-19 16:47:19 +04:00
f41f633d2d
fixed various warnings from the “doc” and other builders
2013-12-19 16:31:30 +04:00
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
c8cbfe5382
added cv::dft T-API test
2013-12-19 13:42:16 +04:00
59cab94fc7
Merge pull request #1997 from alalek:tapi_fix_memleaks
2013-12-18 13:53:17 +04:00
bd91b39593
Merge pull request #1917 from alalek:ocl_d3d
2013-12-17 16:44:27 +04:00
d3fa2bfe8c
Merge pull request #1998 from ilya-lavrenov:tapi_gemm
2013-12-17 16:41:59 +04:00
9d3e7e027a
almost finished opencl-ization of cascade classifier
2013-12-17 14:29:30 +04:00
2f34bb9aa0
added cv::gemm to T-API
2013-12-16 19:12:27 +04:00
f2befa01f4
Fixed build for the TLS-related stuff.
2013-12-16 18:45:41 +04:00
9cb31e86ae
umat: fix memory leaks
2013-12-16 16:46:36 +04:00
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
11b9d5bf4d
core: added DirectX interop implementation (OpenCL) with samples
2013-12-13 19:02:41 +04:00
a118577a57
core: added TLS support
2013-12-11 18:50:11 +04:00
d0114b24e0
core/ocl: replace dynamic runtime
2013-12-11 15:56:54 +04:00
9f388a2be7
core/ocl: autogenerated files for dynamic runtime
2013-12-11 15:56:54 +04:00
5ecf759742
core/ocl: update dynamic runtime
2013-12-11 15:56:54 +04:00
24465bbd05
Merge pull request #1855 from Nerei:master
2013-12-09 14:13:40 +04:00
8db53c1760
Merge pull request #1883 from philippefoubert:branch_matx_inv
2013-12-09 14:07:10 +04:00
262f70f3ab
cv::format declaration in default headers
2013-12-08 19:00:53 +04:00
546c084fe6
fixed shadow error and added ocv_disable_module
2013-12-07 18:58:27 +04:00
Ilya Lavrenov