mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-17 19:08:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,486 Commits 6 Branches 127 Tags 3 GiB
edbff68843
Commit Graph

1591 Commits

Author SHA1 Message Date
Andrey Pavlenko
0fef7f8b96 Merge pull request #2217 from ilya-lavrenov:tapi_superres 2014-02-03 14:38:59 +04:00
Konstantin Matskevich
ffeb223150 test for failure 2014-02-03 14:34:02 +04:00
Ilya Lavrenov
cc47edb850 more strict checks and reseting state 2014-02-03 14:32:25 +04:00
Konstantin Matskevich
aa23a842a1 test for failure 2014-02-03 14:32:25 +04:00
Andrey Pavlenko
13875b5fbc Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2 2014-02-03 14:26:05 +04:00
Andrey Pavlenko
cb1e4b2ede Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl 2014-02-03 14:10:21 +04:00
Roman Donchenko
2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt
 2014-02-03 13:23:59 +04:00
Roman Donchenko
82330a51bd Merge pull request #2253 from ilya-lavrenov:cuda 2014-02-03 12:12:12 +04:00
Roman Donchenko
c967069922 Merge pull request #2254 from ilya-lavrenov:opengl 2014-02-03 12:11:28 +04:00
Ilya Lavrenov
e844c08203 some fixes and improvements in cv::matchTemplate 2014-02-02 19:20:37 +04:00
Ilya Lavrenov
19f799ba1e fix2 for OpenCL on/off 2014-02-02 15:35:13 +04:00
Ilya Lavrenov
02692f9ac0 fix MACRO 2014-02-01 22:43:41 +04:00
Andrey Pavlenko
75dde49b64 Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game 2014-02-01 22:32:39 +04:00
Ilya Lavrenov
ec3eb14138 unused function in case of unavailable OpenGL 2014-02-01 18:14:10 +04:00
Ilya Lavrenov
a6104bd025 fixed unused function in case of unavailable CUDA 2014-02-01 18:11:45 +04:00
Ilya Lavrenov
6ad4823f0c ported superres to T-API 2014-02-01 17:20:18 +04:00
Andrey Pavlenko
25d2ab8a68 Merge pull request #2218 from alalek:fix_defects_code_coverity 2014-01-31 19:23:02 +04:00
Andrey Pavlenko
2c35438771 Merge pull request #2228 from ilya-lavrenov:tapi_experiments 2014-01-31 19:14:19 +04:00
Andrey Pavlenko
0b57d3717f Merge pull request #2244 from ilya-lavrenov:tapi_device_cache 2014-01-31 19:04:30 +04:00
Ilya Lavrenov
d15bf6261a redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked 2014-01-31 14:39:03 +04:00
Ilya Lavrenov
50cf152977 cached commonly used device properties 2014-01-31 14:00:05 +04:00
Andrey Pavlenko
77bbd65fa6 Merge pull request #2220 from ilya-lavrenov:tapi_accumulate 2014-01-30 17:33:06 +04:00
Ilya Lavrenov
1ab1594d00 workaround 2014-01-30 17:26:56 +04:00
Ilya Lavrenov
372cdac07c moved kernelToStr to ocl.hpp 2014-01-30 15:23:11 +04:00
Ilya Lavrenov
86353eb541 fix for PR 2196 2014-01-30 01:47:25 +04:00
Ilya Lavrenov
e7e63fac6c eliminated possible memory leak 2014-01-30 01:21:04 +04:00
Ilya Lavrenov
6d64907f18 async 2014-01-30 00:19:18 +04:00
Ilya Lavrenov
384a28622d added cv::calcHist to T-API (only for CV_8UC1 with 256 bins) 2014-01-29 20:19:15 +04:00
Alexander Alekhin
f91f55927e fix memory management problem 2014-01-29 19:59:01 +04:00
Ilya Lavrenov
7c96d98a24 implemented OpenCL version of cv::accumulate**** 2014-01-29 11:42:46 +04:00
Alexander Alekhin
5474935a81 fixes for defects from code coverity 2014-01-28 20:24:10 +04:00
Andrey Pavlenko
fff5a6c058 Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid 2014-01-28 16:31:30 +04:00
Roman Donchenko
84c29745f2 Merge pull request #2211 from SpecLad:merge-2.4 2014-01-28 12:44:29 +04:00
Andrey Pavlenko
6deda99f07 Merge pull request #2207 from ilya-lavrenov:tapi_macro 2014-01-27 18:56:06 +04:00
Ilya Lavrenov
78c2b3ca2a refactored imgproc 2014-01-27 18:47:16 +04:00
Ilya Lavrenov
48a084c236 OpenCL version of cv::buildPyramid 2014-01-27 18:42:44 +04:00
Andrey Pavlenko
d9b24457fa Merge pull request #2208 from alalek:ocl_dynload_warn 2014-01-27 18:24:14 +04:00
Roman Donchenko
bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
 2014-01-27 15:28:14 +04:00
Alexander Alekhin
1ff9a8ef52 core/ocl: added warning about incompatible configuration 2014-01-27 13:52:52 +04:00
Ilya Lavrenov
321782b9b7 added macro with ability of returning values 2014-01-27 12:32:26 +04:00
Ilya Lavrenov
f767077a41 fixed condition 2014-01-27 12:00:53 +04:00
Ilya Lavrenov
2dd294cc84 fixed cv::split; enabled test 2014-01-27 12:00:53 +04:00
Ilya Lavrenov
fa5492343a added STD_VECTOR_UMAT support to _OutputArray::create 2014-01-27 11:59:59 +04:00
Andrey Pavlenko
a64d3c1744 Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK 2014-01-25 17:08:07 +04:00
Andrey Pavlenko
3f61007563 Merge pull request #2191 from ilya-lavrenov:tapi_macro 2014-01-25 16:32:54 +04:00
Ilya Lavrenov
7f785e0a11 refactored core using new macro 2014-01-24 23:59:00 +04:00
vbystricky
33fc46cdec Validate parameters for using OpenCL version, before upload UMat 2014-01-24 17:37:50 +04:00
vbystricky
4152135e63 Fix error with some opencl functions on the build WITH_OPENCL=OFF 2014-01-24 17:37:50 +04:00
vbystricky
c57e427fba Move OpticalFlowPyrLK from ocl module to video module 2014-01-24 17:37:50 +04:00
Ilya Lavrenov
cc514ac7a9 added new macros useful for tracking whether OpenCL impl run or not 2014-01-24 17:16:40 +04:00
Andrey Pavlenko
5424c55565 Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher 2014-01-24 16:50:03 +04:00
Andrey Pavlenko
b0caa588ec Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo 2014-01-24 16:44:19 +04:00
Konstantin Matskevich
ae827a638c fixes 2014-01-24 14:01:31 +04:00
Andrey Pavlenko
ee88cc2c52 Merge pull request #2110 from hmax:master 2014-01-23 14:37:34 +04:00
Konstantin Matskevich
f90e41d54e dumpinfo 2014-01-22 17:04:44 +04:00
Konstantin Matskevich
ca5689e0db BFMatcher 
match

radiusMatch
 2014-01-22 15:31:26 +04:00
Vladislav Vinogradov
dda999545c fix GpuMat::copyTo method with mask: 
fill destination matrix with zeros if it was reallocated
 2014-01-22 10:40:14 +04:00
Andrey Pavlenko
5d818c010e Merge pull request #2156 from ilya-lavrenov:tapi_reduce 2014-01-22 10:12:08 +04:00
Andrey Pavlenko
99942e8043 Merge pull request #2166 from ilya-lavrenov:tapi_gftt 2014-01-21 22:29:41 +04:00
Ilya Lavrenov
bfa382cf9d fixed copying UMat -> std::vector 2014-01-21 14:37:22 +04:00
Ilya Lavrenov
ae4be413c3 added perf tests for cv::reduce 2014-01-21 14:18:38 +04:00
Andrey Pavlenko
801d2d0a32 Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn 2014-01-20 23:33:55 +04:00
Anatoly Baksheev
02ebc4368c Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style 2014-01-20 22:51:33 +04:00
Roman Donchenko
a509819b21 Merge pull request #2163 from ilya-lavrenov:tapi_channels 2014-01-20 18:48:52 +04:00
Roman Donchenko
9710b25c7d Merge pull request #2173 from Nerei:viz 2014-01-20 18:05:11 +04:00
Roman Donchenko
9dc93ce328 Merge pull request #2176 from SpecLad:merge-2.4 2014-01-20 18:04:56 +04:00
Anatoly Baksheev
ac035b9b8e review comments 2014-01-20 15:22:58 +04:00
Andrey Pavlenko
69ba0c53ad Merge pull request #2165 from ilya-lavrenov:tapi_upload 2014-01-20 15:18:56 +04:00
Roman Donchenko
e45fd939c2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
 2014-01-20 15:10:19 +04:00
Roman Donchenko
087371c021 Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2 2014-01-20 14:15:05 +04:00
Ilya Lavrenov
5d18cf9989 added cv::[extract|insert]Channel to T-API 2014-01-20 13:52:07 +04:00
Roman Donchenko
8386ce2b2f Merge pull request #2160 from SpecLad:norm-assert 2014-01-20 12:20:21 +04:00
Anatoly Baksheev
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
Anatoly Baksheev
7b28f730f4 traits for Affine3 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
a76a34d28e added Affine3: 3x4 input Mat support 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
3e071491c9 added Affine3 ctor from array 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
b1c0bf1fee Affine::rotate(rvec) method 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
7e952e2f10 removed incorrect and unnecessarily methods from Affine3f 2014-01-19 18:38:43 +04:00
Ilya Lavrenov
5af2e6f1c9 removed useless CRC calculation 2014-01-19 11:57:50 +04:00
Drew Jetter
6bf599b1bc Fixed bug #3489: The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent. 2014-01-18 23:04:16 -07:00
Ilya Lavrenov
6b8bee6e0b fixed kernel compilation warnings 2014-01-18 22:37:47 +04:00
Ilya Lavrenov
37789f015a deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
Roman Donchenko
0de799b3b0 Removed some duplicate assertions. 2014-01-17 18:25:28 +04:00
Roman Donchenko
79fcc06a4b Merge pull request #2146 from SpecLad:merge-2.4 2014-01-17 16:28:30 +04:00
Roman Donchenko
e9805e444f Fixed an overly-narrow assertion in cv::norm. 
size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
 2014-01-17 14:49:42 +04:00
Roman Donchenko
5f8d8c0069 Added a test for matrix-to-vector copy and convert. 2014-01-17 14:18:31 +04:00
Roman Donchenko
4e4a7d0353 Removed an unnecessary workaround for matrix-to-vector copyTo. 2014-01-17 14:16:22 +04:00
Roman Donchenko
ee97a5e757 Re-fix bug #3319 with less side effects. 2014-01-17 14:13:21 +04:00
Roman Donchenko
f02204847a Revert "fixed bug #3319" 
See 092f916 for explanation.

This reverts commit 4f9c081dc3.
 2014-01-17 13:43:00 +04:00
Roman Donchenko
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 there.
 2014-01-17 12:51:52 +04:00
Ilya Lavrenov
93a818684c ported cv::Canny to T-API 2014-01-17 11:13:28 +04:00
Ilya Lavrenov
63a5e39e2c added cv::reduce to T-API 2014-01-17 00:41:18 +04:00
Roman Donchenko
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
Andrey Pavlenko
fdb1019b9e Merge pull request #2147 from ilya-lavrenov:tapi_sqrt 2014-01-14 11:34:03 +04:00
Ilya Lavrenov
09bff78d63 deleted extra arg in case of power=0.5 2014-01-13 19:59:10 +04:00
Roman Donchenko
af9cd79e16 Merge pull request #2121 from ilya-lavrenov:tapi_perf 2014-01-13 16:30:33 +04:00
Max Khardin
d8e5f1611b Rewrite definition/declaration of variables to be more compact 2014-01-13 15:55:49 +04:00
Andrey Pavlenko
6071671bda Merge pull request #2135 from alalek:ocl_runtime_cleanup_2 2014-01-11 17:15:22 +04:00
Ilya Lavrenov
da2790249e added NORM_L2SQR type to cv::norm 2014-01-10 18:45:52 +04:00
Ilya Lavrenov
2e5e278271 added cv::PSNR performance test 2014-01-10 18:45:40 +04:00