Konstantin Matskevich
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
Roman Donchenko
16a11cfb27
Merge pull request #1842 from StevenPuttemans:bugfix_3315
2013-11-25 12:38:56 +04:00
StevenPuttemans
1b0297d92b
Added fixes mentioned in bugreport 3306
...
- Added author provided fixes
- Added code example
- Added documentation fixes
2013-11-25 09:35:23 +01:00
Roman Donchenko
75fba08042
Merge pull request #1822 from SpecLad:msvc12
2013-11-25 12:19:58 +04:00
Roman Donchenko
4c5593b633
Merge pull request #1837 from asmorkalov:android_opencl
2013-11-25 12:19:20 +04:00
Roman Donchenko
06f6f74e61
Merge pull request #1839 from pmiecielica:memory_leaks
2013-11-25 12:17:08 +04:00
Roman Donchenko
684ff70308
Merge pull request #1864 from berak:mouse_and_match
2013-11-25 12:15:52 +04:00
Roman Donchenko
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
2013-11-25 12:04:17 +04:00
Roman Donchenko
59aa516ca5
Merge pull request #1860 from alalek:ocl_fix_undef_warn
2013-11-25 12:00:25 +04:00
berak
10639d63f5
mouse_and_match.py missing import cv2
2013-11-24 15:58:13 +01:00
Jason Newton
88b2fe9dbb
correct upper bound for maximum number of labels for 8-way connectivity
2013-11-24 01:20:07 -08:00
Andrey Pavlenko
3ab47300ce
Merge pull request #1862 from alalek:ocl_disable_tests
2013-11-23 18:54:52 +04:00
Alexander Alekhin
fd4a7e7d1f
ocl: disable tests
2013-11-23 18:13:32 +04:00
Andrey Pavlenko
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
2013-11-23 16:44:58 +04:00
Andrey Pavlenko
b82c55de12
Merge pull request #1861 from ilya-lavrenov:ocl_args_fix
2013-11-23 16:44:38 +04:00
Ilya Lavrenov
1af95ea12c
fixed error in setting kernel arguments
2013-11-22 18:56:03 +04:00
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
2013-11-22 18:37:44 +04:00
Roman Donchenko
0537747f79
Merge pull request #1853 from StevenPuttemans:bugfix_3346
2013-11-22 18:26:16 +04:00
Alexander Alekhin
ddc9be9170
ocl: don't disable Undef warnings
2013-11-22 18:24:50 +04:00
Alexander Alekhin
fbc91c5ee9
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
2013-11-22 18:24:20 +04:00
Roman Donchenko
901dc3b878
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5
2013-11-22 18:15:49 +04:00
Roman Donchenko
dd817857b4
Replaced most of the instances of "s = s +" with "s +=".
...
This resynchronizes master code with 2.4. I say "most", because I might
have missed some due to different spacing; I'll deal with those
instances later if I find them.
2013-11-22 17:59:56 +04:00
Roman Donchenko
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
2013-11-22 17:58:40 +04:00
Ilya Lavrenov
c8abb6124f
recursive mutex for linux
2013-11-22 17:30:32 +04:00
StevenPuttemans
e59912f803
Applied fix mentioned in bugreport 3370. Seems to solve the issue.
2013-11-22 14:25:47 +01:00
Piotr Miecielica
a19cc6cb64
Added pointer initialization
2013-11-22 13:33:33 +01:00
Alexander Smorkalov
514e97223c
Some hacks to build and run OpenCL on Qualcomm S800.
...
Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.
2013-11-22 16:13:38 +04:00
Alexander Alekhin
d650efc069
ocl: multi-threading: opencl buffer memory guard
2013-11-22 14:39:51 +04:00
Alexander Alekhin
96a4a7b339
ocl: multi-threading: fix bug in intialization
2013-11-22 14:39:33 +04:00
Alexander Smorkalov
bd314bf955
VFPv4 detection implemented. Some Tegra5 related updates.
2013-11-22 14:30:23 +04:00
Andrey Pavlenko
c1f59c4c76
Merge pull request #1852 from ilya-lavrenov:ocl_retina
2013-11-22 13:57:22 +04:00
StevenPuttemans
2427c03625
Wrong example at the visual studio tutorial. Fixed link, fixed sample
...
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
2013-11-22 10:41:17 +01:00
StevenPuttemans
7a8bd31657
Fixed bug in report #3346
2013-11-22 09:57:47 +01:00
Ilya Lavrenov
8834d5e57b
changed eps in Retina_OCL test
2013-11-22 12:35:46 +04:00
Alexander Smorkalov
fd759223fa
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
2013-11-22 11:46:18 +04:00
Piotr Miecielica
923698d700
Fixes of some memory leaks
2013-11-21 18:55:09 +01:00
Andrey Pavlenko
c33cb94d66
Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix
2013-11-21 21:29:26 +04:00
Andrey Pavlenko
ca8c129c57
Merge pull request #1848 from ilya-lavrenov:warn
2013-11-21 21:29:09 +04:00
Ilya Lavrenov
650f92f9cc
eliminated warning C4267
2013-11-21 18:27:07 +04:00
Ilya Lavrenov
561a7f5782
fixed kernel compilation in imgproc module
2013-11-21 18:23:57 +04:00
Andrey Pavlenko
8a4f35704a
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
2013-11-21 17:32:53 +04:00
Andrey Pavlenko
9bf2516eb1
Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
2013-11-21 17:32:37 +04:00
Roman Donchenko
2509b7954e
Merge pull request #1838 from alekcac:ios64_fix
2013-11-21 17:11:29 +04:00
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
2013-11-21 14:22:24 +04:00
Ilya Lavrenov
d764af5318
added extra parameters to ocl::cvtColor performance test
2013-11-21 12:53:21 +04:00
Roman Donchenko
6b23cb5b02
Merge pull request #1795 from alalek:perf_report_progress
2013-11-21 12:31:36 +04:00
Roman Donchenko
b8f5fcf3f9
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
2013-11-21 12:03:02 +04:00
Roman Donchenko
623a02c69f
Merge pull request #1834 from SpecLad:svm-copy-ctor
2013-11-21 11:55:20 +04:00
