platform/upstream/opencv.git
10 years agoMerge pull request #1924 from ilya-lavrenov:svm
Andrey Pavlenko [Wed, 4 Dec 2013 15:56:31 +0000 (19:56 +0400)]
Merge pull request #1924 from ilya-lavrenov:svm

10 years agoModify default setting, using ocl method when have ocl module
Baichuan Su [Tue, 12 Nov 2013 05:13:25 +0000 (13:13 +0800)]
Modify default setting, using ocl method when have ocl module

10 years agoAdd Macro to decide using ocl method or not.
Baichuan Su [Mon, 11 Nov 2013 03:46:07 +0000 (11:46 +0800)]
Add Macro to decide using ocl method or not.

10 years agoAdd OpenCL SVM paths for bagofwords_classification and points_classifier samples.
Baichuan Su [Sat, 9 Nov 2013 00:42:39 +0000 (08:42 +0800)]
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.

10 years agoMerge pull request #1921 from SpecLad:defined-msc-ver
Roman Donchenko [Wed, 4 Dec 2013 11:46:56 +0000 (15:46 +0400)]
Merge pull request #1921 from SpecLad:defined-msc-ver

10 years agoMerge pull request #1919 from SpecLad:platfrom
Roman Donchenko [Wed, 4 Dec 2013 09:55:45 +0000 (13:55 +0400)]
Merge pull request #1919 from SpecLad:platfrom

10 years agoMerge pull request #1915 from jet47:gpu-color-test-fix
Roman Donchenko [Wed, 4 Dec 2013 09:55:28 +0000 (13:55 +0400)]
Merge pull request #1915 from jet47:gpu-color-test-fix

10 years agoFixed a -Wundef warning in cl_platform.h.
Roman Donchenko [Wed, 4 Dec 2013 08:39:20 +0000 (12:39 +0400)]
Fixed a -Wundef warning in cl_platform.h.

_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee.

10 years agoMerge pull request #1911 from apavlenko:2.4_fix_vc12
Andrey Pavlenko [Tue, 3 Dec 2013 15:20:04 +0000 (19:20 +0400)]
Merge pull request #1911 from apavlenko:2.4_fix_vc12

10 years agoMerge pull request #1916 from alalek:ocl_moments_fix_perf
Roman Donchenko [Tue, 3 Dec 2013 13:58:04 +0000 (17:58 +0400)]
Merge pull request #1916 from alalek:ocl_moments_fix_perf

10 years agofixing compilation on Linux
Andrey Pavlenko [Tue, 3 Dec 2013 13:46:09 +0000 (17:46 +0400)]
fixing compilation on Linux

10 years agoFixed the "platfrom" typo everywhere.
Roman Donchenko [Tue, 3 Dec 2013 13:33:28 +0000 (17:33 +0400)]
Fixed the "platfrom" typo everywhere.

10 years agoAdded patch from master for fixing VS2013 in 3rd party lib OpenEXR
Andrey Pavlenko [Tue, 3 Dec 2013 12:08:57 +0000 (16:08 +0400)]
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR

10 years agoocl:perf: fix moments test for plain impl
Alexander Alekhin [Tue, 3 Dec 2013 12:02:41 +0000 (16:02 +0400)]
ocl:perf: fix moments test for plain impl

10 years agoadded additional check in cv::gpu::demosaicing that source is not empty
Vladislav Vinogradov [Tue, 3 Dec 2013 11:55:47 +0000 (15:55 +0400)]
added additional check in cv::gpu::demosaicing that source is not empty

10 years agofix gpu test for Demosaicing:
Vladislav Vinogradov [Tue, 3 Dec 2013 11:55:10 +0000 (15:55 +0400)]
fix gpu test for Demosaicing:

check that input images was loaded correctly

10 years agoMerge pull request #1907 from severin-lemaignan:emscripten-2.4
Roman Donchenko [Tue, 3 Dec 2013 09:38:10 +0000 (13:38 +0400)]
Merge pull request #1907 from severin-lemaignan:emscripten-2.4

10 years agofixing build of 2.4 branch with VC12 (aka 2013)
Andrey Pavlenko [Tue, 3 Dec 2013 09:16:44 +0000 (13:16 +0400)]
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

10 years agoEnsure compilation to Javascript with Emscripten
Séverin Lemaignan [Tue, 26 Nov 2013 04:53:44 +0000 (05:53 +0100)]
Ensure compilation to Javascript with Emscripten

10 years agoMerge pull request #1899 from berak:b_3171_24
Andrey Pavlenko [Tue, 3 Dec 2013 07:32:30 +0000 (11:32 +0400)]
Merge pull request #1899 from berak:b_3171_24

10 years agoMerge pull request #1906 from asmorkalov:android_ocl_warn_fix
Andrey Pavlenko [Tue, 3 Dec 2013 07:20:48 +0000 (11:20 +0400)]
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix

10 years agoMerge pull request #1744 from liuxing6666:2.4_fix_harris_test
Andrey Pavlenko [Mon, 2 Dec 2013 16:38:48 +0000 (20:38 +0400)]
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test

10 years agoMerge pull request #1590 from ilya-lavrenov:cmd_parser_fix
Andrey Pavlenko [Mon, 2 Dec 2013 16:07:46 +0000 (20:07 +0400)]
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix

10 years agoMerge pull request #1887 from jet47:android-cuda-6.0
Roman Donchenko [Mon, 2 Dec 2013 14:53:26 +0000 (18:53 +0400)]
Merge pull request #1887 from jet47:android-cuda-6.0

10 years agoMerge pull request #1797 from moodoki:bugfix_3344
Roman Donchenko [Mon, 2 Dec 2013 13:53:33 +0000 (17:53 +0400)]
Merge pull request #1797 from moodoki:bugfix_3344

10 years agoWarning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
Alexander Smorkalov [Mon, 2 Dec 2013 13:48:27 +0000 (17:48 +0400)]
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.

10 years agoMerge pull request #1897 from berak:b_3393_24
Roman Donchenko [Mon, 2 Dec 2013 13:11:55 +0000 (17:11 +0400)]
Merge pull request #1897 from berak:b_3393_24

10 years agoMerge pull request #1898 from berak:b_3349_24
Roman Donchenko [Mon, 2 Dec 2013 10:14:41 +0000 (14:14 +0400)]
Merge pull request #1898 from berak:b_3349_24

10 years agoMerge pull request #1884 from asmorkalov:winrt_img_proc_sample
Roman Donchenko [Mon, 2 Dec 2013 08:27:50 +0000 (12:27 +0400)]
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample

10 years agoMerge pull request #1894 from asmorkalov:ocv_debug_build
Roman Donchenko [Mon, 2 Dec 2013 08:17:29 +0000 (12:17 +0400)]
Merge pull request #1894 from asmorkalov:ocv_debug_build

10 years agoCV_WRAP for BackgroundSubtractorMOG2
berak [Sat, 30 Nov 2013 12:35:23 +0000 (13:35 +0100)]
CV_WRAP for BackgroundSubtractorMOG2

10 years agocorrected initialization of output_folder in facereco examples
berak [Sat, 30 Nov 2013 12:09:42 +0000 (13:09 +0100)]
corrected initialization of output_folder in facereco examples

10 years agoswapped x,y in elbp_
berak [Sat, 30 Nov 2013 11:00:22 +0000 (12:00 +0100)]
swapped x,y in elbp_

10 years agoMerge pull request #1845 from StevenPuttemans:bugfix_3306
Andrey Pavlenko [Fri, 29 Nov 2013 19:08:20 +0000 (23:08 +0400)]
Merge pull request #1845 from StevenPuttemans:bugfix_3306

10 years agoSome debug options are removed because they are installed by Cmake automatically.
Alexander Smorkalov [Fri, 29 Nov 2013 11:34:50 +0000 (15:34 +0400)]
Some debug options are removed because they are installed by Cmake automatically.

Also forcing -ggdb3 on android leads to debuging issues.

10 years agoMerge pull request #1892 from asmorkalov:android_native_camera_close_fix
Roman Donchenko [Fri, 29 Nov 2013 11:10:12 +0000 (15:10 +0400)]
Merge pull request #1892 from asmorkalov:android_native_camera_close_fix

10 years agofixed compilation of gpu-basics-similarity tutorial:
Vladislav Vinogradov [Fri, 29 Nov 2013 10:53:33 +0000 (14:53 +0400)]
fixed compilation of gpu-basics-similarity tutorial:

initialize TIMES variable with some default value (10)

10 years agoAndroid native camera destruction fixed for Android 4.4.
Alexander Smorkalov [Fri, 29 Nov 2013 06:38:26 +0000 (10:38 +0400)]
Android native camera destruction fixed for Android 4.4.

10 years agoFilter selection and several filters implemented for WinRT sample.
Alexander Smorkalov [Mon, 30 Sep 2013 04:22:18 +0000 (08:22 +0400)]
Filter selection and several filters implemented for WinRT sample.

10 years agoMerge pull request #1885 from jet47:gpu-bgfg-test-fix
Roman Donchenko [Thu, 28 Nov 2013 10:11:39 +0000 (14:11 +0400)]
Merge pull request #1885 from jet47:gpu-bgfg-test-fix

10 years agofixed CUDA_TOOLKIT_TARGET_DIR for android:
Vladislav Vinogradov [Thu, 28 Nov 2013 09:35:23 +0000 (13:35 +0400)]
fixed CUDA_TOOLKIT_TARGET_DIR for android:

use targets/armv7-linux-androideabi is exists

10 years agoMerge pull request #1879 from LeszekSwirski:traincascade-2.4
Roman Donchenko [Thu, 28 Nov 2013 08:24:44 +0000 (12:24 +0400)]
Merge pull request #1879 from LeszekSwirski:traincascade-2.4

10 years agoMerge pull request #1873 from abak:hough_24
Roman Donchenko [Thu, 28 Nov 2013 08:11:24 +0000 (12:11 +0400)]
Merge pull request #1873 from abak:hough_24

10 years agoadded `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:55 +0000 (10:21 +0400)]
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags

10 years agofixed compilation warnings in .cu files
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:30 +0000 (10:21 +0400)]
fixed compilation warnings in .cu files

10 years agofixed CC arch/pts for android (used sm_32)
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:13 +0000 (10:21 +0400)]
fixed CC arch/pts for android (used sm_32)

10 years agoenable CUDA support for android
Vladislav Vinogradov [Wed, 30 Oct 2013 06:20:45 +0000 (10:20 +0400)]
enable CUDA support for android

10 years agoImage processing sample for WinRT added.
Alexander Smorkalov [Thu, 29 Aug 2013 10:42:30 +0000 (03:42 -0700)]
Image processing sample for WinRT added.

10 years agodisabled MOG2 performance test (sanity check fails on CUDA 6.0)
Vladislav Vinogradov [Wed, 27 Nov 2013 13:36:58 +0000 (17:36 +0400)]
disabled MOG2 performance test (sanity check fails on CUDA 6.0)

10 years agofixed perf tests for bgfg segmentation
Vladislav Vinogradov [Wed, 27 Nov 2013 13:32:00 +0000 (17:32 +0400)]
fixed perf tests for bgfg segmentation

10 years agofix exception being thrown when no arguments are passed
Adrien BAK [Thu, 28 Nov 2013 03:09:17 +0000 (12:09 +0900)]
fix exception being thrown when no arguments are passed

10 years agobuild fix
Adrien BAK [Thu, 28 Nov 2013 02:42:44 +0000 (11:42 +0900)]
build fix

10 years agoFixed compilation errors: removed using namespace from hpp file. This led to pulling...
Anatoly Baksheev [Sat, 16 Nov 2013 15:56:08 +0000 (19:56 +0400)]
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

10 years agoRemove all using directives for STL namespace and members
Andrey Kamaev [Sun, 24 Feb 2013 16:14:01 +0000 (20:14 +0400)]
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 2a6fb2867e2fc639e0675eed8abb1688de4539ec)
(only cherry picked "apps/trancascade")

10 years agoMerge pull request #1858 from StevenPuttemans:updates_traincascade
Roman Donchenko [Wed, 27 Nov 2013 13:37:36 +0000 (17:37 +0400)]
Merge pull request #1858 from StevenPuttemans:updates_traincascade

10 years agoMerge pull request #1877 from tim36272:patch-2
Roman Donchenko [Wed, 27 Nov 2013 13:35:52 +0000 (17:35 +0400)]
Merge pull request #1877 from tim36272:patch-2

10 years agoFixed minor documentation typo
tim36272 [Wed, 27 Nov 2013 12:09:40 +0000 (04:09 -0800)]
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.

10 years agoAdded extras to traincascade functionality
StevenPuttemans [Thu, 21 Nov 2013 13:07:53 +0000 (14:07 +0100)]
Added extras to traincascade functionality

10 years agoMerge pull request #1849 from StevenPuttemans:feature_3375_documentation
Roman Donchenko [Wed, 27 Nov 2013 09:22:31 +0000 (13:22 +0400)]
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation

10 years agoMerge pull request #1875 from asmorkalov:android_bin_compat_fix
Andrey Pavlenko [Tue, 26 Nov 2013 19:17:28 +0000 (23:17 +0400)]
Merge pull request #1875 from asmorkalov:android_bin_compat_fix

10 years agoBuild error fix for binary-complience-checker tool.
Alexander Smorkalov [Tue, 26 Nov 2013 13:39:40 +0000 (17:39 +0400)]
Build error fix for binary-complience-checker tool.

10 years agofix indent
Adrien BAK [Wed, 13 Nov 2013 07:21:09 +0000 (16:21 +0900)]
fix indent

10 years agofix typos
Adrien BAK [Wed, 13 Nov 2013 07:13:47 +0000 (16:13 +0900)]
fix typos

10 years agoimproved error handling
Adrien BAK [Mon, 11 Nov 2013 05:55:12 +0000 (14:55 +0900)]
improved error handling

10 years agomodified HoughCircleDemo to introduce variable params via trackbars
Adrien BAK [Mon, 11 Nov 2013 05:47:54 +0000 (14:47 +0900)]
modified HoughCircleDemo to introduce variable params via trackbars

Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp

10 years agoMerge pull request #1856 from alalek:ocl_fix_mt
Andrey Pavlenko [Tue, 26 Nov 2013 05:58:21 +0000 (09:58 +0400)]
Merge pull request #1856 from alalek:ocl_fix_mt

10 years agoApplied feature #3375 and fix of pull 1842 to avoid merging problems later
StevenPuttemans [Thu, 21 Nov 2013 15:45:48 +0000 (16:45 +0100)]
Applied feature #3375 and fix of pull 1842 to avoid merging problems later

10 years agoMerge pull request #1842 from StevenPuttemans:bugfix_3315
Roman Donchenko [Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)]
Merge pull request #1842 from StevenPuttemans:bugfix_3315

10 years agoAdded fixes mentioned in bugreport 3306
StevenPuttemans [Thu, 21 Nov 2013 14:03:49 +0000 (15:03 +0100)]
Added fixes mentioned in bugreport 3306
- Added author provided fixes
- Added code example
- Added documentation fixes

10 years agoMerge pull request #1822 from SpecLad:msvc12
Roman Donchenko [Mon, 25 Nov 2013 08:19:58 +0000 (12:19 +0400)]
Merge pull request #1822 from SpecLad:msvc12

10 years agoMerge pull request #1837 from asmorkalov:android_opencl
Roman Donchenko [Mon, 25 Nov 2013 08:19:20 +0000 (12:19 +0400)]
Merge pull request #1837 from asmorkalov:android_opencl

10 years agoMerge pull request #1839 from pmiecielica:memory_leaks
Roman Donchenko [Mon, 25 Nov 2013 08:17:07 +0000 (12:17 +0400)]
Merge pull request #1839 from pmiecielica:memory_leaks

10 years agoMerge pull request #1860 from alalek:ocl_fix_undef_warn
Roman Donchenko [Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)]
Merge pull request #1860 from alalek:ocl_fix_undef_warn

10 years agoMerge pull request #1853 from StevenPuttemans:bugfix_3346
Roman Donchenko [Fri, 22 Nov 2013 14:26:16 +0000 (18:26 +0400)]
Merge pull request #1853 from StevenPuttemans:bugfix_3346

10 years agoocl: don't disable Undef warnings
Alexander Alekhin [Fri, 22 Nov 2013 14:24:50 +0000 (18:24 +0400)]
ocl: don't disable Undef warnings

10 years agoocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
Alexander Alekhin [Thu, 21 Nov 2013 08:35:37 +0000 (12:35 +0400)]
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)

10 years agoMerge pull request #1854 from asmorkalov:android_engine_tegra4i5
Roman Donchenko [Fri, 22 Nov 2013 14:15:48 +0000 (18:15 +0400)]
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5

10 years agoAdded pointer initialization
Piotr Miecielica [Fri, 22 Nov 2013 12:33:33 +0000 (13:33 +0100)]
Added pointer initialization

10 years agoSome hacks to build and run OpenCL on Qualcomm S800.
Alexander Smorkalov [Thu, 19 Sep 2013 07:49:49 +0000 (11:49 +0400)]
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.

10 years agoocl: multi-threading: opencl buffer memory guard
Alexander Alekhin [Fri, 22 Nov 2013 10:38:12 +0000 (14:38 +0400)]
ocl: multi-threading: opencl buffer memory guard

10 years agoocl: multi-threading: fix bug in intialization
Alexander Alekhin [Fri, 22 Nov 2013 10:31:54 +0000 (14:31 +0400)]
ocl: multi-threading: fix bug in intialization

10 years agoVFPv4 detection implemented. Some Tegra5 related updates.
Alexander Smorkalov [Fri, 22 Nov 2013 09:59:36 +0000 (13:59 +0400)]
VFPv4 detection implemented. Some Tegra5 related updates.

10 years agoWrong example at the visual studio tutorial. Fixed link, fixed sample
StevenPuttemans [Thu, 21 Nov 2013 12:32:21 +0000 (13:32 +0100)]
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.

10 years agoFixed bug in report #3346
StevenPuttemans [Fri, 22 Nov 2013 08:57:47 +0000 (09:57 +0100)]
Fixed bug in report #3346

10 years agoPackage selection for Tegra 4i fixed. Initial Tegra5 support added.
Alexander Smorkalov [Fri, 22 Nov 2013 07:12:51 +0000 (11:12 +0400)]
Package selection for Tegra 4i fixed. Initial Tegra5 support added.

10 years agoFixes of some memory leaks
Piotr Miecielica [Tue, 19 Nov 2013 16:35:27 +0000 (17:35 +0100)]
Fixes of some memory leaks

10 years agoMerge pull request #1840 from ilya-lavrenov:ocl_cvtColor
Andrey Pavlenko [Thu, 21 Nov 2013 13:32:53 +0000 (17:32 +0400)]
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor

10 years agoMerge pull request #1838 from alekcac:ios64_fix
Roman Donchenko [Thu, 21 Nov 2013 13:11:29 +0000 (17:11 +0400)]
Merge pull request #1838 from alekcac:ios64_fix

10 years agoadded extra parameters to ocl::cvtColor performance test
Ilya Lavrenov [Thu, 21 Nov 2013 08:53:21 +0000 (12:53 +0400)]
added extra parameters to ocl::cvtColor performance test

10 years agoMerge pull request #1795 from alalek:perf_report_progress
Roman Donchenko [Thu, 21 Nov 2013 08:31:36 +0000 (12:31 +0400)]
Merge pull request #1795 from alalek:perf_report_progress

10 years agoMerge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
Roman Donchenko [Thu, 21 Nov 2013 08:03:01 +0000 (12:03 +0400)]
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea

10 years agoMerge pull request #1834 from SpecLad:svm-copy-ctor
Roman Donchenko [Thu, 21 Nov 2013 07:55:20 +0000 (11:55 +0400)]
Merge pull request #1834 from SpecLad:svm-copy-ctor

10 years agoperf report: summary.py: added --progress mode
Alexander Alekhin [Wed, 20 Nov 2013 15:57:20 +0000 (19:57 +0400)]
perf report: summary.py: added --progress mode

10 years agoMerge pull request #1836 from ilya-lavrenov:ocl_norm_workaround
Roman Donchenko [Wed, 20 Nov 2013 14:19:07 +0000 (18:19 +0400)]
Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround

10 years agofix for supporting 64-bit architecture
Alexander Shishkov [Wed, 20 Nov 2013 14:08:05 +0000 (18:08 +0400)]
fix for supporting 64-bit architecture

10 years agoMerge pull request #1833 from SpecLad:fix-qt-sample
Roman Donchenko [Wed, 20 Nov 2013 13:59:35 +0000 (17:59 +0400)]
Merge pull request #1833 from SpecLad:fix-qt-sample

10 years agoMerge pull request #1829 from SpecLad:config-components-libs
Roman Donchenko [Wed, 20 Nov 2013 11:57:14 +0000 (15:57 +0400)]
Merge pull request #1829 from SpecLad:config-components-libs

10 years agoworkaround for AMD bug: UNREACHABLE EXECUTED
Ilya Lavrenov [Wed, 20 Nov 2013 11:40:56 +0000 (15:40 +0400)]
workaround for AMD bug: UNREACHABLE EXECUTED

11 years agoGave CvSVM a private copy constructor & assignment operator.
Roman Donchenko [Wed, 20 Nov 2013 10:59:42 +0000 (14:59 +0400)]
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>.

11 years agoFix the Qt sample, broken after #1722.
Roman Donchenko [Wed, 20 Nov 2013 10:57:21 +0000 (14:57 +0400)]
Fix the Qt sample, broken after #1722.