Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
2013-12-03 13:38:10 +04:00
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
2013-12-03 09:18:59 +01:00
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
2013-12-03 11:32:31 +04:00
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
2013-12-03 11:20:48 +04:00
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
2013-12-02 20:38:49 +04:00
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
2013-12-02 20:07:47 +04:00
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
2013-12-02 17:51:29 +04:00
Roman Donchenko
838961a289
Merge pull request #1897 from berak:b_3393_24
2013-12-02 17:11:56 +04:00
Roman Donchenko
fb568755a1
Merge pull request #1898 from berak:b_3349_24
2013-12-02 14:14:41 +04:00
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
2013-12-02 12:27:51 +04:00
Roman Donchenko
f20af817d4
Merge pull request #1894 from asmorkalov:ocv_debug_build
2013-12-02 12:17:30 +04:00
berak
34a390fbc2
CV_WRAP for BackgroundSubtractorMOG2
2013-11-30 13:35:23 +01:00
berak
059bf1d9e5
corrected initialization of output_folder in facereco examples
2013-11-30 13:09:42 +01:00
berak
773616ee04
swapped x,y in elbp_
2013-11-30 12:00:22 +01:00
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
2013-11-29 23:08:20 +04:00
Alexander Smorkalov
d39e73365c
Some debug options are removed because they are installed by Cmake automatically.
...
Also forcing -ggdb3 on android leads to debuging issues.
2013-11-29 15:34:50 +04:00
Roman Donchenko
f8801cfdb8
Merge pull request #1892 from asmorkalov:android_native_camera_close_fix
2013-11-29 15:10:13 +04:00
Vladislav Vinogradov
fc1d38ced8
fixed compilation of gpu-basics-similarity tutorial:
...
initialize TIMES variable with some default value (10)
2013-11-29 14:53:33 +04:00
Alexander Smorkalov
a13db7c8fa
Android native camera destruction fixed for Android 4.4.
2013-11-29 10:38:26 +04:00
Alexander Smorkalov
6b09345232
Filter selection and several filters implemented for WinRT sample.
2013-11-29 09:47:25 +04:00
Roman Donchenko
41154b30de
Merge pull request #1885 from jet47:gpu-bgfg-test-fix
2013-11-28 14:11:40 +04:00
Vladislav Vinogradov
5ac8444c22
fixed CUDA_TOOLKIT_TARGET_DIR for android:
...
use targets/armv7-linux-androideabi is exists
2013-11-28 13:35:23 +04:00
Roman Donchenko
70c1b700d9
Merge pull request #1879 from LeszekSwirski:traincascade-2.4
2013-11-28 12:24:45 +04:00
Roman Donchenko
19b88a17bf
Merge pull request #1873 from abak:hough_24
2013-11-28 12:11:24 +04:00
Vladislav Vinogradov
81acc5e73e
added -Xptxas;-dlcm=ca and -target-os-variant=Android to nvcc flags
2013-11-28 10:00:55 +04:00
Vladislav Vinogradov
26cb0ce1d5
fixed compilation warnings in .cu files
2013-11-28 10:00:48 +04:00
Vladislav Vinogradov
20641b4a0b
fixed CC arch/pts for android (used sm_32)
2013-11-28 10:00:47 +04:00
Vladislav Vinogradov
51663f5612
enable CUDA support for android
2013-11-28 10:00:47 +04:00
Alexander Smorkalov
2cfd635e9e
Image processing sample for WinRT added.
2013-11-27 21:54:11 -08:00
Vladislav Vinogradov
7537521f53
disabled MOG2 performance test (sanity check fails on CUDA 6.0)
2013-11-28 09:50:05 +04:00
Vladislav Vinogradov
7c43daccba
fixed perf tests for bgfg segmentation
2013-11-28 09:49:50 +04:00
Adrien BAK
38904c9a11
fix exception being thrown when no arguments are passed
2013-11-28 12:09:17 +09:00
Adrien BAK
094d7c4926
build fix
2013-11-28 11:42:44 +09:00
Anatoly Baksheev
37a754621a
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
...
Conflicts:
apps/traincascade/boost.cpp
2013-11-27 14:53:21 +00:00
Andrey Kamaev
bef34093aa
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
(cherry picked from commit 2a6fb2867e
2013-11-27 14:46:47 +00:00
Roman Donchenko
d5ead208b7
Merge pull request #1858 from StevenPuttemans:updates_traincascade
2013-11-27 17:37:36 +04:00
Roman Donchenko
935f973575
Merge pull request #1877 from tim36272:patch-2
2013-11-27 17:35:53 +04:00
tim36272
7539156109
Fixed minor documentation typo
...
In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.
2013-11-27 04:09:40 -08:00
StevenPuttemans
a4239f972b
Added extras to traincascade functionality
2013-11-27 12:54:11 +01:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Andrey Pavlenko
1253c2101b
Merge pull request #1875 from asmorkalov:android_bin_compat_fix
2013-11-26 23:17:28 +04:00
Alexander Smorkalov
8fe4ab280b
Build error fix for binary-complience-checker tool.
2013-11-26 17:39:40 +04:00
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
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
