Andrey Pavlenko
9dea590ada
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
11 years ago
Andrey Pavlenko
39754bd6f9
Merge pull request #1920 from alalek:ocl_disable_workaround
11 years ago
Zhigang Gong
6ce03b0484
Fixed some implicitly type conversions between vector and scalar data type.
...
There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
11 years ago
Andrey Pavlenko
098d4e6174
Merge pull request #1924 from ilya-lavrenov:svm
11 years ago
Baichuan Su
632b21e090
Modify default setting, using ocl method when have ocl module
11 years ago
Baichuan Su
2cf16db683
Add Macro to decide using ocl method or not.
11 years ago
Baichuan Su
00300baa53
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
11 years ago
Roman Donchenko
d8a4d3a2eb
Merge pull request #1921 from SpecLad:defined-msc-ver
11 years ago
Roman Donchenko
3e1586a1c6
Merge pull request #1919 from SpecLad:platfrom
11 years ago
Roman Donchenko
fa2cd93ecf
Merge pull request #1915 from jet47:gpu-color-test-fix
11 years ago
Alexander Alekhin
7b551af424
ocl: try to disable clFinish workaround
11 years ago
Roman Donchenko
11c7053b0f
Fixed a -Wundef warning in cl_platform.h.
...
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee
.
11 years ago
Andrey Pavlenko
8752414718
Merge pull request #1911 from apavlenko:2.4_fix_vc12
11 years ago
Roman Donchenko
3509018bd6
Merge pull request #1916 from alalek:ocl_moments_fix_perf
11 years ago
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
11 years ago
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
11 years ago
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
11 years ago
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
11 years ago
Vladislav Vinogradov
adb2040980
added additional check in cv::gpu::demosaicing that source is not empty
11 years ago
Vladislav Vinogradov
14ee306b9e
fix gpu test for Demosaicing:
...
check that input images was loaded correctly
11 years ago
Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
11 years ago
Andrey Pavlenko
bd9d3dd561
fixing build of 2.4 branch with VC12 (aka 2013)
...
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
11 years ago
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
11 years ago
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
11 years ago
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
11 years ago
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
11 years ago
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
11 years ago
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
11 years ago
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
11 years ago
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
11 years ago
Roman Donchenko
838961a289
Merge pull request #1897 from berak:b_3393_24
11 years ago
Roman Donchenko
fb568755a1
Merge pull request #1898 from berak:b_3349_24
11 years ago
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
11 years ago
Roman Donchenko
f20af817d4
Merge pull request #1894 from asmorkalov:ocv_debug_build
11 years ago
berak
34a390fbc2
CV_WRAP for BackgroundSubtractorMOG2
11 years ago
berak
059bf1d9e5
corrected initialization of output_folder in facereco examples
11 years ago
berak
773616ee04
swapped x,y in elbp_
11 years ago
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
11 years ago
Alexander Smorkalov
d39e73365c
Some debug options are removed because they are installed by Cmake automatically.
...
Also forcing -ggdb3 on android leads to debuging issues.
11 years ago
Roman Donchenko
f8801cfdb8
Merge pull request #1892 from asmorkalov:android_native_camera_close_fix
11 years ago
Vladislav Vinogradov
fc1d38ced8
fixed compilation of gpu-basics-similarity tutorial:
...
initialize TIMES variable with some default value (10)
11 years ago
Alexander Smorkalov
a13db7c8fa
Android native camera destruction fixed for Android 4.4.
11 years ago
Alexander Smorkalov
6b09345232
Filter selection and several filters implemented for WinRT sample.
11 years ago
Roman Donchenko
41154b30de
Merge pull request #1885 from jet47:gpu-bgfg-test-fix
11 years ago
Vladislav Vinogradov
5ac8444c22
fixed CUDA_TOOLKIT_TARGET_DIR for android:
...
use targets/armv7-linux-androideabi is exists
11 years ago
Roman Donchenko
70c1b700d9
Merge pull request #1879 from LeszekSwirski:traincascade-2.4
11 years ago
Roman Donchenko
19b88a17bf
Merge pull request #1873 from abak:hough_24
11 years ago
Vladislav Vinogradov
81acc5e73e
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
11 years ago
Vladislav Vinogradov
26cb0ce1d5
fixed compilation warnings in .cu files
11 years ago
Vladislav Vinogradov
20641b4a0b
fixed CC arch/pts for android (used sm_32)
11 years ago