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
Vladimir Bystricky
268d814d18
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 16:57:47 +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
Vadim Pisarevsky
302a5adcc2
converted Haar cascades to the new format; now they are handled with C++ code.
2013-12-10 22:54:37 +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
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
2013-12-10 13:07:52 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Roman Donchenko
5c72c74b09
Merge pull request #1960 from ilya-lavrenov:tapi_bilateral
2013-12-10 12:13:15 +04:00
Roman Donchenko
13c058ecf8
Merge pull request #1959 from botverse:2.4
2013-12-09 17:25:33 +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
f3ba1a361e
Merge pull request #1930 from alalek:cmake_msvs_subfolders
2013-12-09 16:21:16 +04:00
Ilya Lavrenov
93c6fe66ce
added cv::bilateralFilter to T-API
2013-12-09 16:03:25 +04:00
Peter Andreas Entschev
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
2013-12-09 09:54:42 -02:00
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
2013-12-09 10:55:44 +00: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
Andrey Pavlenko
0dfa188ca5
Merge pull request #1948 from ilya-lavrenov:tapi_norm
2013-12-09 13:25:41 +04:00
Roman Donchenko
8f10ca5180
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
2013-12-09 13:14:16 +04:00
Andrey Pavlenko
041ad1f4cd
Merge pull request #1944 from ilya-lavrenov:minor_commits
2013-12-09 12:44:26 +04:00
Vladimir Bystricky
8d8f5665f1
Fix build errors on Linux system
2013-12-09 11:31:55 +04:00
