platform/upstream/opencv.git
10 years agoFix: freeing previous elements has to be done before loading new parameters to avoid...
Pierre-Emmanuel Viel [Fri, 3 Jan 2014 12:16:36 +0000 (13:16 +0100)]
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified

10 years agoFix some memory leaks in HierarchicalClusteringIndex
Pierre-Emmanuel Viel [Wed, 18 Dec 2013 14:01:47 +0000 (15:01 +0100)]
Fix some memory leaks in HierarchicalClusteringIndex

10 years agoMerge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill
Andrey Pavlenko [Wed, 18 Dec 2013 15:13:22 +0000 (19:13 +0400)]
Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill

10 years agoMerge pull request #2011 from ilya-lavrenov:dft_dct
Roman Donchenko [Wed, 18 Dec 2013 13:36:18 +0000 (17:36 +0400)]
Merge pull request #2011 from ilya-lavrenov:dft_dct

10 years agoadding more than 4 channels random Mats support
Andrey Pavlenko [Wed, 18 Dec 2013 13:27:39 +0000 (17:27 +0400)]
adding more than 4 channels random Mats support

if `Scalar:all` is used, Mats with 5+ channels cause errors

10 years agoMerge pull request #2013 from apavlenko:2.4_fd_sample
Andrey Pavlenko [Wed, 18 Dec 2013 13:05:17 +0000 (17:05 +0400)]
Merge pull request #2013 from apavlenko:2.4_fd_sample

10 years agoadding timing for multi-threaded case
Andrey Pavlenko [Wed, 18 Dec 2013 13:02:39 +0000 (17:02 +0400)]
adding timing for multi-threaded case

10 years agominor refactoring, no functional changes
Andrey Pavlenko [Tue, 17 Dec 2013 20:15:02 +0000 (00:15 +0400)]
minor refactoring, no functional changes

10 years agotypo
Ilya Lavrenov [Tue, 17 Dec 2013 13:41:28 +0000 (17:41 +0400)]
typo

10 years agoMerge pull request #1987 from pentschev:cv_completesymm_template_2.4
Roman Donchenko [Tue, 17 Dec 2013 09:17:25 +0000 (13:17 +0400)]
Merge pull request #1987 from pentschev:cv_completesymm_template_2.4

10 years agoMerge pull request #1990 from AD-530:Issue3164
Roman Donchenko [Mon, 16 Dec 2013 08:11:43 +0000 (12:11 +0400)]
Merge pull request #1990 from AD-530:Issue3164

10 years agocv::completeSymm fixed to work with any OpenCV data type and multiple channels.
Peter Andreas Entschev [Sun, 15 Dec 2013 00:48:01 +0000 (22:48 -0200)]
cv::completeSymm fixed to work with any OpenCV data type and multiple channels.

10 years agofixed init of clCxt
Matthias Bady [Sun, 15 Dec 2013 21:41:07 +0000 (22:41 +0100)]
fixed init of clCxt

10 years agoMerge pull request #1980 from alalek:ocl_interop_initialization
Andrey Pavlenko [Fri, 13 Dec 2013 12:09:08 +0000 (16:09 +0400)]
Merge pull request #1980 from alalek:ocl_interop_initialization

10 years agoocl: add support for initialization from user-provided OpenCL handles
Alexander Alekhin [Thu, 12 Dec 2013 15:59:22 +0000 (19:59 +0400)]
ocl: add support for initialization from user-provided OpenCL handles

10 years agoMerge pull request #1976 from alalek:ocl_multiple_command_queues
Andrey Pavlenko [Thu, 12 Dec 2013 05:55:33 +0000 (09:55 +0400)]
Merge pull request #1976 from alalek:ocl_multiple_command_queues

10 years agoMerge pull request #1975 from magomimmo:clj-tut
Andrey Pavlenko [Wed, 11 Dec 2013 17:25:31 +0000 (21:25 +0400)]
Merge pull request #1975 from magomimmo:clj-tut

10 years agoocl: implemented per-thread OpenCL command queue
Alexander Alekhin [Wed, 11 Dec 2013 14:49:50 +0000 (18:49 +0400)]
ocl: implemented per-thread OpenCL command queue

10 years agocore: added TLS support
Alexander Alekhin [Wed, 11 Dec 2013 14:49:13 +0000 (18:49 +0400)]
core: added TLS support

10 years agoMerge pull request #1968 from pentschev:fix_indentation_freak_2.4
Roman Donchenko [Wed, 11 Dec 2013 12:55:26 +0000 (16:55 +0400)]
Merge pull request #1968 from pentschev:fix_indentation_freak_2.4

10 years agoremove Daniele
Mimmmo Cosenza [Wed, 11 Dec 2013 12:35:20 +0000 (13:35 +0100)]
remove Daniele

10 years agoadd tutorial content
Mimmmo Cosenza [Wed, 11 Dec 2013 12:30:52 +0000 (13:30 +0100)]
add tutorial content

10 years agoadd clojure tutorial
Mimmmo Cosenza [Wed, 11 Dec 2013 12:28:27 +0000 (13:28 +0100)]
add clojure tutorial

10 years agoadd clojure logo
Mimmmo Cosenza [Wed, 11 Dec 2013 12:28:04 +0000 (13:28 +0100)]
add clojure logo

10 years agoadd clojure sample
Mimmmo Cosenza [Wed, 11 Dec 2013 12:26:47 +0000 (13:26 +0100)]
add clojure sample

10 years agoadd Mimmo Cosenza to Authors
Mimmmo Cosenza [Wed, 11 Dec 2013 12:25:53 +0000 (13:25 +0100)]
add Mimmo Cosenza to Authors

10 years agoFixing some indentation issues on FREAK source file.
Peter Andreas Entschev [Tue, 10 Dec 2013 10:57:46 +0000 (08:57 -0200)]
Fixing some indentation issues on FREAK source file.

10 years agoMerge pull request #1959 from botverse:2.4
Roman Donchenko [Mon, 9 Dec 2013 13:25:33 +0000 (17:25 +0400)]
Merge pull request #1959 from botverse:2.4

10 years ago--no-display property fix in stereo_match.cpp sample
Alfonso (the fonz) de la Osa [Mon, 9 Dec 2013 10:55:44 +0000 (10:55 +0000)]
--no-display property fix in stereo_match.cpp sample

10 years agoMerge pull request #1946 from asmorkalov:android_manager_version_inc3
Roman Donchenko [Mon, 9 Dec 2013 09:14:15 +0000 (13:14 +0400)]
Merge pull request #1946 from asmorkalov:android_manager_version_inc3

10 years agoOpenCV Manager version++.
Alexander Smorkalov [Fri, 6 Dec 2013 14:01:15 +0000 (18:01 +0400)]
OpenCV Manager version++.

10 years agoMerge pull request #1945 from apavlenko:2.4_version_update
Roman Donchenko [Fri, 6 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #1945 from apavlenko:2.4_version_update

10 years agoMerge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
Andrey Pavlenko [Fri, 6 Dec 2013 12:59:02 +0000 (16:59 +0400)]
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4

10 years agoupdating version to 2.4.7.2
Andrey Pavlenko [Fri, 6 Dec 2013 12:21:22 +0000 (16:21 +0400)]
updating version to 2.4.7.2

10 years agoMerge pull request #1927 from JBosch:issue3409
Andrey Pavlenko [Fri, 6 Dec 2013 12:06:03 +0000 (16:06 +0400)]
Merge pull request #1927 from JBosch:issue3409

10 years agoMerge pull request #1872 from KonstantinMatskevich:ocl_mt_test
Andrey Pavlenko [Fri, 6 Dec 2013 12:00:10 +0000 (16:00 +0400)]
Merge pull request #1872 from KonstantinMatskevich:ocl_mt_test

10 years agoMerge pull request #1762 from jet47:cuda-6.0-npp-fix
Andrey Pavlenko [Fri, 6 Dec 2013 11:56:14 +0000 (15:56 +0400)]
Merge pull request #1762 from jet47:cuda-6.0-npp-fix

10 years agoMerge pull request #1844 from StevenPuttemans:bugfix_3370
Andrey Pavlenko [Fri, 6 Dec 2013 11:51:59 +0000 (15:51 +0400)]
Merge pull request #1844 from StevenPuttemans:bugfix_3370

10 years agoMerge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
Andrey Pavlenko [Fri, 6 Dec 2013 11:47:39 +0000 (15:47 +0400)]
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers

10 years agoRemoving ocl::oclMat::ptr() method.
Peter Andreas Entschev [Fri, 6 Dec 2013 11:31:18 +0000 (09:31 -0200)]
Removing ocl::oclMat::ptr() method.

The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.

10 years agoMerge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
Andrey Pavlenko [Fri, 6 Dec 2013 11:05:34 +0000 (15:05 +0400)]
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4

10 years agoMerge pull request #2 from apavlenko/ocl_mt_test
Konstantin Matskevich [Fri, 6 Dec 2013 11:03:27 +0000 (03:03 -0800)]
Merge pull request #2 from apavlenko/ocl_mt_test

minor improvements

10 years agoMerge pull request #1929 from alalek:ocl_haar_amd_beta
Andrey Pavlenko [Fri, 6 Dec 2013 10:56:47 +0000 (14:56 +0400)]
Merge pull request #1929 from alalek:ocl_haar_amd_beta

10 years agominor improvements
Andrey Pavlenko [Fri, 6 Dec 2013 10:49:36 +0000 (14:49 +0400)]
minor improvements

10 years agosome fixes
Konstantin Matskevich [Fri, 6 Dec 2013 08:12:24 +0000 (12:12 +0400)]
some fixes

10 years agoocl::BruteForceMatcher fix wrong use of oclMat::ptr().
Peter Andreas Entschev [Thu, 5 Dec 2013 21:27:10 +0000 (19:27 -0200)]
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().

The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.

10 years agoMerge pull request #1933 from gongzg:fix-ocl-kernel-2.4
Andrey Pavlenko [Thu, 5 Dec 2013 13:05:25 +0000 (17:05 +0400)]
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4

10 years agoocl: added workaround into Haar kernels
Alexander Alekhin [Thu, 5 Dec 2013 09:52:26 +0000 (13:52 +0400)]
ocl: added workaround into Haar kernels

10 years agoMerge pull request #1920 from alalek:ocl_disable_workaround
Andrey Pavlenko [Thu, 5 Dec 2013 12:46:25 +0000 (16:46 +0400)]
Merge pull request #1920 from alalek:ocl_disable_workaround

10 years agomultithreading facedetector
Konstantin Matskevich [Mon, 2 Dec 2013 07:15:46 +0000 (11:15 +0400)]
multithreading facedetector

10 years agofacedetect
Konstantin Matskevich [Fri, 22 Nov 2013 10:47:58 +0000 (14:47 +0400)]
facedetect

10 years agoFixed some implicitly type conversions between vector and scalar data type.
Zhigang Gong [Tue, 3 Dec 2013 02:49:51 +0000 (10:49 +0800)]
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>
10 years agoFixed little issue with mouse callback refering to issue 3409. Was using round instea...
Josep Bosch [Wed, 4 Dec 2013 21:32:20 +0000 (22:32 +0100)]
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.

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 agoocl: try to disable clFinish workaround
Alexander Alekhin [Wed, 4 Dec 2013 09:00:37 +0000 (13:00 +0400)]
ocl: try to disable clFinish workaround

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)