Adrien BAK
dda3b534ad
fix indent
2013-11-26 16:09:59 +09:00
Adrien BAK
1c025be068
fix typos
2013-11-26 16:09:42 +09:00
Adrien BAK
514f1fae95
improved error handling
2013-11-26 16:09:29 +09:00
Adrien BAK
8a2de2ecca
modified HoughCircleDemo to introduce variable params via trackbars
...
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
2013-11-26 16:09:04 +09:00
Andrey Pavlenko
d45ce086c1
Merge pull request #1856 from alalek:ocl_fix_mt
2013-11-26 09:58:22 +04:00
Roman Donchenko
16a11cfb27
Merge pull request #1842 from StevenPuttemans:bugfix_3315
2013-11-25 12:38:56 +04: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
59aa516ca5
Merge pull request #1860 from alalek:ocl_fix_undef_warn
2013-11-25 12:00:25 +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
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
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
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
8a4f35704a
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
2013-11-21 17:32:53 +04:00
Roman Donchenko
2509b7954e
Merge pull request #1838 from alekcac:ios64_fix
2013-11-21 17:11:29 +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
Alexander Alekhin
c1541c9e79
perf report: summary.py: added --progress mode
2013-11-20 19:57:20 +04:00
Roman Donchenko
70a4de20d7
Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround
2013-11-20 18:19:08 +04:00
Alexander Shishkov
9631cb6de9
fix for supporting 64-bit architecture
2013-11-20 18:08:05 +04:00
Roman Donchenko
f6283432ff
Merge pull request #1833 from SpecLad:fix-qt-sample
2013-11-20 17:59:35 +04:00
Roman Donchenko
8ac3ddf421
Merge pull request #1829 from SpecLad:config-components-libs
2013-11-20 15:57:14 +04:00
Ilya Lavrenov
60b59eeb73
workaround for AMD bug: UNREACHABLE EXECUTED
2013-11-20 15:40:56 +04:00
Roman Donchenko
cf00349b5b
Gave CvSVM a private copy constructor & assignment operator.
...
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)
"Fixes" <http://code.opencv.org/issues/3358 >.
2013-11-20 14:59:42 +04:00
Roman Donchenko
b8283edfca
Fix the Qt sample, broken after #1722 .
2013-11-20 14:57:21 +04:00
Roman Donchenko
b197ec9413
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
2013-11-20 13:36:37 +04:00
Philippe FOUBERT
78e16a906b
Back to the previous coding way (using the macro with the goto).
2013-11-19 21:51:47 +01:00
Roman Donchenko
4037a4f227
Fixed OpenCV_LIBS when find_package has been used with explicit components.
...
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/ >.
2013-11-19 18:44:17 +04:00
Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
2013-11-19 16:25:47 +04:00
Roman Donchenko
5c77784ac9
Merge pull request #1827 from asmorkalov:android_ndk_r9b
2013-11-19 14:53:16 +04:00
Roman Donchenko
0a90a36a1f
Merge pull request #1793 from SpecLad:external-docs-1
2013-11-19 14:21:48 +04:00
Roman Donchenko
c47190ef90
Merge pull request #1787 from hs3180:2.4
2013-11-19 14:21:25 +04:00
Ilya Lavrenov
198cd1a40d
added area fast mode to ocl::resize
2013-11-19 13:43:50 +04:00
Roman Donchenko
4746a710bb
Merge pull request #1820 from asmorkalov:android_native_camera_44
2013-11-19 12:47:48 +04:00
Roman Donchenko
3e55d705cc
Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum
2013-11-19 12:34:09 +04:00
Roman Donchenko
56f791679b
Merge pull request #1825 from jet47:fix-opengl-mem-leak
2013-11-19 12:31:53 +04:00
Roman Donchenko
68d1110cde
Merge pull request #1821 from SpecLad:watch-your-slashes
2013-11-19 12:29:55 +04:00
Alexander Smorkalov
e08b075db0
Android NDK r9b support added.
2013-11-19 11:46:29 +04:00
