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
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
Alexander Alekhin
c1541c9e79
perf report: summary.py: added --progress mode
2013-11-20 19:57:20 +04:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +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
3703c7040a
Merge pull request #1828 from SpecLad:merge-2.4
2013-11-20 16:08:53 +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
4cfbee70bd
Simplified the Windows implementation of CV_XADD.
...
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365 >.
2013-11-20 13:47:35 +04:00
Roman Donchenko
b197ec9413
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
2013-11-20 13:36:37 +04:00
Roman Donchenko
95006af170
Merge pull request #1816 from SpecLad:no-more-epoch
2013-11-20 11:52:54 +04:00
Roman Donchenko
63b3db53d7
Merge pull request #1830 from SpecLad:config-includes
2013-11-20 11:52:30 +04:00
Vadim Pisarevsky
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
2013-11-19 20:51:31 -05:00
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
2013-11-19 19:20:24 -05: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
ef27ac3782
In the example in OpenCVConfig.cmake.in, explicitly add the include paths.
...
After #1801 , the include directories are no longer added automatically,
so we should show the user how to do that.
2013-11-19 19:00:56 +04:00
Roman Donchenko
7f935717cb
In OpenCVConfig.cmake.in, lowercased the commands in the example.
...
This is the preferred style nowadays, and more consistent with the
rest of the code.
2013-11-19 18:58:33 +04: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
