Roman Donchenko
|
f2befa01f4
|
Fixed build for the TLS-related stuff.
|
2013-12-16 18:45:41 +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 |
|
Roman Donchenko
|
e88253ccad
|
Merge pull request #1990 from AD-530:Issue3164
|
2013-12-16 12:11:43 +04:00 |
|
Matthias Bady
|
b7c97f6e30
|
fixed init of clCxt
|
2013-12-15 22:41:07 +01:00 |
|
Andrey Pavlenko
|
172a5d42a9
|
Merge pull request #1974 from ilya-lavrenov:tapi_equalizehist
|
2013-12-13 19:47:34 +04:00 |
|
Ilya Lavrenov
|
5c0dabf1ea
|
added cv::equalizeHist to T-API
|
2013-12-13 19:46:20 +04:00 |
|
Andrey Pavlenko
|
c9ed05c3bd
|
Merge pull request #1981 from ilya-lavrenov:tapi_sqrt
|
2013-12-13 19:34:28 +04:00 |
|
Andrey Pavlenko
|
8e15a6f98d
|
Merge pull request #1983 from ilya-lavrenov:tapi_umat
|
2013-12-13 19:29:49 +04:00 |
|
Ilya Lavrenov
|
e30875bcef
|
fixed UMat sync problems
|
2013-12-13 18:38:12 +04:00 |
|
Andrey Pavlenko
|
10849d1c7a
|
Merge pull request #1980 from alalek:ocl_interop_initialization
|
2013-12-13 16:09:09 +04:00 |
|
Alexander Alekhin
|
17ca7f9545
|
ocl: add support for initialization from user-provided OpenCL handles
|
2013-12-12 19:59:22 +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
|
b43d6b6858
|
Merge pull request #1954 from pentschev:ocl_features2d_fast_master
|
2013-12-12 17:37:09 +04:00 |
|
Andrey Pavlenko
|
5299b13434
|
Merge pull request #1979 from pentschev:ocl_arithm_sqrt_master
|
2013-12-12 17:35:01 +04:00 |
|
Andrey Pavlenko
|
b0a9220de8
|
Merge pull request #1889 from alalek:ocl_core_dynamic_runtime
|
2013-12-12 17:27:34 +04:00 |
|
Peter Andreas Entschev
|
5bc9f15dda
|
OCL: included sqrt matrix operation.
|
2013-12-12 08:57:27 -02:00 |
|
Andrey Pavlenko
|
ac1c6dac93
|
Merge pull request #1978 from ilya-lavrenov:ocl_min_max
|
2013-12-12 09:55:50 +04:00 |
|
Andrey Pavlenko
|
658282fcbe
|
Merge pull request #1976 from alalek:ocl_multiple_command_queues
|
2013-12-12 09:55:33 +04:00 |
|
Peter Andreas Entschev
|
41bec1b112
|
OCL: including FAST feature detector.
|
2013-12-11 21:23:27 -02: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 |
|
Andrey Pavlenko
|
eeb16a5d01
|
Merge pull request #1971 from ilya-lavrenov:tapi_laplacian
|
2013-12-11 21:25:54 +04:00 |
|
Andrey Pavlenko
|
ee270d1a18
|
Merge pull request #1975 from magomimmo:clj-tut
|
2013-12-11 21:25:31 +04:00 |
|
Alexander Alekhin
|
740b1f235e
|
ocl: implemented per-thread OpenCL command queue
|
2013-12-11 19:12:09 +04:00 |
|
Alexander Alekhin
|
a118577a57
|
core: added TLS support
|
2013-12-11 18:50:11 +04:00 |
|
Andrey Pavlenko
|
9b29b127c5
|
Merge pull request #1973 from ilya-lavrenov:ocl_haar_sample
|
2013-12-11 17:51:36 +04:00 |
|
Roman Donchenko
|
ce503c64bf
|
Merge pull request #1968 from pentschev:fix_indentation_freak_2.4
|
2013-12-11 16:55:26 +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 |
|
Andrey Pavlenko
|
129b715e3d
|
Merge pull request #1958 from vbystricky:ocl_filter2D
|
2013-12-11 16:41:12 +04:00 |
|
Mimmmo Cosenza
|
00a180185e
|
remove Daniele
|
2013-12-11 13:35:20 +01:00 |
|
Mimmmo Cosenza
|
1c639befe6
|
add tutorial content
|
2013-12-11 13:30:52 +01:00 |
|
Mimmmo Cosenza
|
b1899e5489
|
add clojure tutorial
|
2013-12-11 13:28:27 +01:00 |
|
Mimmmo Cosenza
|
6f292d8036
|
add clojure logo
|
2013-12-11 13:28:04 +01:00 |
|
Mimmmo Cosenza
|
f07e9e7c5f
|
add clojure sample
|
2013-12-11 13:26:47 +01:00 |
|
Mimmmo Cosenza
|
2784fd7b27
|
add Mimmo Cosenza to Authors
|
2013-12-11 13:25:53 +01:00 |
|
Alexander Alekhin
|
91fc0c3bc3
|
bioinspired: fix ocl test, skip them if OpenCL is not available
|
2013-12-11 15:56:54 +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 |
|
Ilya Lavrenov
|
1015c5c24d
|
fixed facedetect sample
|
2013-12-11 15:08:49 +04:00 |
|
Vladimir Bystricky
|
f76bf8b425
|
Fix error in test
|
2013-12-11 14:33:22 +04:00 |
|
Vladimir Bystricky
|
e7227d3e4b
|
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
|
2013-12-11 14:26:33 +04:00 |
|
Andrey Pavlenko
|
b5cdc03b81
|
Merge pull request #1972 from alalek:ocl_queue_cleanup_hung
|
2013-12-11 14:06:49 +04:00 |
|
Alexander Alekhin
|
bdbd3eb2bf
|
ocl: process termination hung workaround
|
2013-12-11 00:31:34 +04:00 |
|
Ilya Lavrenov
|
8fa8b36b42
|
added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API
|
2013-12-10 23:20:28 +04:00 |
|
Ilya Lavrenov
|
5566d31468
|
more strict checks outside ROI
|
2013-12-10 19:30:14 +04:00 |
|
Andrey Pavlenko
|
d802b4d143
|
Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear
|
2013-12-10 18:49:42 +04:00 |
|
Peter Andreas Entschev
|
c289c8a700
|
Fixing some indentation issues on FREAK source file.
|
2013-12-10 08:57:46 -02:00 |
|
Roman Donchenko
|
90c28d254f
|
Merge pull request #1961 from SpecLad:merge-2.4
|
2013-12-10 14:39:35 +04:00 |
|