1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Commit Graph

5686 Commits

Author SHA1 Message Date
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