Commit Graph

1454 Commits

Author SHA1 Message Date
Konstantin Matskevich
55634c1f52 fix 2013-12-30 13:06:32 +04:00
Alexander Alekhin
44970ddf56 eliminate MINGW pragma warning 2013-12-30 12:31:00 +04:00
Ilya Lavrenov
c4c913ff13 converted CPU-based example to T-API (Mat 2 UMat, etc) 2013-12-30 03:19:17 +04:00
Ilya Lavrenov
6b64257c81 added OpenCL version of cv::scaleAdd 2013-12-29 18:46:25 +04:00
Ilya Lavrenov
abcf8d9e61 implemented OpenCL version of cv::convertScaleAbs 2013-12-29 18:01:19 +04:00
Andrey Pavlenko
4a6c2ce378 Merge pull request #2081 from ilya-lavrenov:tapi_perf 2013-12-28 22:06:12 +04:00
Andrey Pavlenko
dbaf125fcd Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels 2013-12-28 22:05:49 +04:00
Ilya Lavrenov
bb7e96311e disabled cv::split perf test 2013-12-27 21:57:20 +04:00
Roman Donchenko
2d2312d742 Merge pull request #2077 from ilya-lavrenov:tapi_context 2013-12-27 20:23:57 +04:00
Ilya Lavrenov
31e6251793 added new perf tests to core 2013-12-27 20:02:12 +04:00
Alexander Smorkalov
df63060e4d Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules. 2013-12-27 18:04:10 +04:00
Ilya Lavrenov
f221f57c7c this commit prevents segfaults in case of opencl disabled 2013-12-27 14:02:03 +04:00
Ilya Lavrenov
73c96cbd50 some fixes of cv::mixChannels 2013-12-27 13:59:55 +04:00
Ilya Lavrenov
2eab07f0a4 disabled cv::dft opencl impl for CPU devices 2013-12-27 13:39:29 +04:00
Ilya Lavrenov
a7d2830d3f added cv::mixChannels to T-API 2013-12-27 13:14:37 +04:00
Roman Donchenko
c45492371a Merge pull request #2036 from GregoryMorse:patch-1 2013-12-27 12:44:02 +04:00
Roman Donchenko
ee36717db4 Merge pull request #2037 from GregoryMorse:patch-2 2013-12-27 12:11:52 +04:00
Andrey Pavlenko
4644a864a5 Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject 2013-12-26 20:37:34 +04:00
Andrey Pavlenko
fd6a74496b Merge pull request #2066 from ilya-lavrenov:tapi_ocl 2013-12-26 19:38:01 +04:00
Andrey Pavlenko
c8a52daafd Merge pull request #2054 from alalek:ocl_tapi_dev_selection 2013-12-26 17:27:06 +04:00
Ilya Lavrenov
fc1f9ab236 removed unnecessary data copying 2013-12-26 17:13:26 +04:00
GregoryMorse
4880858119 Update CMakeLists.txt
WinRT native C++ support allowing building of static libraries

Update CMakeLists.txt

Update OpenCVCRTLinkage.cmake

Update OpenCVCRTLinkage.cmake
2013-12-26 19:45:21 +08:00
Ilya Lavrenov
d64bea00b2 ported cv::calcBackProject to T-API 2013-12-26 14:58:50 +04:00
Alexander Smorkalov
1e038e2837 CUDA warning fix/supporession for Android. 2013-12-26 10:17:38 +04:00
Alexander Smorkalov
4aa9f83100 Dynamic CUDA support library name fixed. Additional error messages added. 2013-12-26 10:16:29 +04:00
Alexander Alekhin
217b2282b8 fixes 2013-12-26 03:06:58 +04:00
Andrey Pavlenko
65b020f0d3 Merge pull request #2046 from ilya-lavrenov:tapi_inrange 2013-12-26 00:14:23 +04:00
Andrey Pavlenko
6e8386f705 Merge pull request #1984 from ilya-lavrenov:tapi_perf 2013-12-26 00:13:28 +04:00
Andrey Pavlenko
512ddcc804 Merge pull request #2043 from ilya-lavrenov:tapi_hack 2013-12-25 19:00:26 +04:00
Ilya Lavrenov
4c23059209 added cv::inRange to T-API 2013-12-25 18:22:41 +04:00
Ilya Lavrenov
d7c22343aa added perf tests for T-API core functions 2013-12-25 18:19:40 +04:00
Roman Donchenko
faddd5b97f Merge pull request #2045 from SpecLad:merge-2.4 2013-12-25 16:18:00 +04:00
Alexander Alekhin
e49065b1dc core/ocl: temporary move device selection from ocl module 2013-12-25 16:17:40 +04:00
Ilya Lavrenov
a70467d7a2 removed unnecessary assert 2013-12-23 21:51:25 +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
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
Roman Donchenko
83cdd43a4c Merge pull request #2039 from asmorkalov:ocv_version_inc3 2013-12-23 15:53:11 +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
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
Roman Donchenko
b0ec7dafd8 Merge pull request #1950 from GregoryMorse:patch-2 2013-12-20 17:54:02 +04:00
Roman Donchenko
b4bd5bab6d Merge pull request #2021 from vpisarev:ocl_facedetect7 2013-12-20 12:30:49 +04:00
Alexander Smorkalov
529bd41751 Build fixes for case where HAVE_CUDA==OFF. 2013-12-20 11:37:15 +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
Andrey Pavlenko
dde1d6b636 Merge pull request #2018 from ilya-lavrenov:tapi_dft 2013-12-19 16:47:19 +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
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
Ilya Lavrenov
b3af0e3154 added cv::repeat to T-API 2013-12-19 14:28:09 +04:00
Ilya Lavrenov
c8cbfe5382 added cv::dft T-API test 2013-12-19 13:42:16 +04:00
Alexander Smorkalov
64c94cb22c CUDA related func tables refactored to remove unneeded dependencies. 2013-12-19 11:18:04 +04:00
Alexander Smorkalov
6da7c50fb5 Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime. 2013-12-19 10:27:38 +04:00
Alexander Smorkalov
442082eb0f Fixes for Android support. 2013-12-19 09:38:46 +04:00
Andrey Pavlenko
59cab94fc7 Merge pull request #1997 from alalek:tapi_fix_memleaks 2013-12-18 13:53:17 +04:00
Andrey Pavlenko
388d0ef182 Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto 2013-12-18 13:46:14 +04:00
Alexander Smorkalov
be530bd085 DeviceInfo class method that were implemented in header moved to cpp file. 2013-12-18 12:02:15 +04:00
Ilya Lavrenov
3a6d248bee typo 2013-12-17 17:41:28 +04:00
Andrey Pavlenko
bd91b39593 Merge pull request #1917 from alalek:ocl_d3d 2013-12-17 16:44:27 +04:00
Andrey Pavlenko
586a5cb6db Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc 2013-12-17 16:42:44 +04:00
Andrey Pavlenko
d3fa2bfe8c Merge pull request #1998 from ilya-lavrenov:tapi_gemm 2013-12-17 16:41:59 +04:00
Ilya Lavrenov
ac030c16f1 fixed UMat::copyTo(UMat) 2013-12-17 15:23:39 +04:00
Vadim Pisarevsky
9d3e7e027a almost finished opencl-ization of cascade classifier 2013-12-17 14:29:30 +04:00
Roman Donchenko
52a785e95a Merge pull request #1996 from SpecLad:merge-2.4 2013-12-17 13:21:48 +04:00
Konstantin Matskevich
5cf4166801 some fixes 2013-12-17 12:43:21 +04:00
Konstantin Matskevich
904dac7670 minMaxLoc 2013-12-17 12:43:21 +04:00
Alexander Smorkalov
88a883e68e Build fix. 2013-12-17 10:24:00 +04:00
Ilya Lavrenov
2f34bb9aa0 added cv::gemm to T-API 2013-12-16 19:12:27 +04:00
Roman Donchenko
f2befa01f4 Fixed build for the TLS-related stuff. 2013-12-16 18:45:41 +04:00
Alexander Alekhin
9cb31e86ae umat: fix memory leaks 2013-12-16 16:46:36 +04:00
Roman Donchenko
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
Alexander Smorkalov
8660e048bc Dynamic CUDA support library loading implemented for Linux.
Logical mistake in macro fixed;
DeviceInfo deligate reimplemented;
Build and warning fixes.
2013-12-16 14:46:44 +04:00
Alexander Smorkalov
d4087f19a2 All CUDA related stuff were moved to separate dynamic library. 2013-12-16 14:46:44 +04:00
Peter Andreas Entschev
f44de302a0 cv::completeSymm fixed to work with any OpenCV data type and multiple channels. 2013-12-15 20:56:55 -02:00
Ilya Lavrenov
558c4a2b1d implemented UMat::convertTo 2013-12-15 14:15:30 +04:00
Andrey Pavlenko
c9ed05c3bd Merge pull request #1981 from ilya-lavrenov:tapi_sqrt 2013-12-13 19:34:28 +04:00
Alexander Alekhin
11b9d5bf4d core: added DirectX interop implementation (OpenCL) with samples 2013-12-13 19:02:41 +04:00
Ilya Lavrenov
e30875bcef fixed UMat sync problems 2013-12-13 18:38:12 +04:00
Ilya Lavrenov
1d6715e58a added cv::sqrt to T-API (using built-in sqrt OpenCL function) 2013-12-12 18:12:30 +04:00
Andrey Pavlenko
b0a9220de8 Merge pull request #1889 from alalek:ocl_core_dynamic_runtime 2013-12-12 17:27:34 +04:00
Ilya Lavrenov
b20714a8a8 fixed kernel compilation of cv::min, cv::max for CV_64F 2013-12-12 02:42:24 +04:00
Andrey Pavlenko
f3e2bfea79 Merge pull request #1970 from ilya-lavrenov:tapi_checks 2013-12-11 21:37:10 +04:00
Alexander Alekhin
a118577a57 core: added TLS support 2013-12-11 18:50:11 +04:00
Alexander Alekhin
3bbf51fbfb ocl: disabled test for Split (there are problems with OutputArray and getMatRef) 2013-12-11 16:46:08 +04:00
Alexander Alekhin
d0114b24e0 core/ocl: replace dynamic runtime 2013-12-11 15:56:54 +04:00
Alexander Alekhin
9f388a2be7 core/ocl: autogenerated files for dynamic runtime 2013-12-11 15:56:54 +04:00
Alexander Alekhin
5ecf759742 core/ocl: update dynamic runtime 2013-12-11 15:56:54 +04:00
Alexander Alekhin
381d7851b7 core/ocl: move opencl dynamic runtime from ocl module 2013-12-11 15:56:54 +04:00
Alexander Alekhin
bdbd3eb2bf ocl: process termination hung workaround 2013-12-11 00:31:34 +04:00
Ilya Lavrenov
5566d31468 more strict checks outside ROI 2013-12-10 19:30:14 +04:00
Roman Donchenko
9d87f9c974 Merge pull request #1956 from ilya-lavrenov:tapi_split_merge 2013-12-09 16:56:06 +04:00
Roman Donchenko
24465bbd05 Merge pull request #1855 from Nerei:master 2013-12-09 14:13:40 +04:00
Roman Donchenko
8db53c1760 Merge pull request #1883 from philippefoubert:branch_matx_inv 2013-12-09 14:07:10 +04:00