platform/upstream/opencv.git
10 years agoMerge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
Roman Donchenko [Thu, 9 Jan 2014 09:24:20 +0000 (13:24 +0400)]
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24

10 years agoFix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
Kazuki Matsuda [Sun, 5 Jan 2014 17:24:14 +0000 (02:24 +0900)]
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)

Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.

First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113

10 years agoMerge pull request #2084 from ilya-lavrenov:cont
Roman Donchenko [Tue, 31 Dec 2013 12:51:29 +0000 (16:51 +0400)]
Merge pull request #2084 from ilya-lavrenov:cont

10 years agofixed bug #3319
Ilya Lavrenov [Fri, 27 Dec 2013 21:40:21 +0000 (01:40 +0400)]
fixed bug #3319

10 years agoMerge pull request #2094 from SpecLad:multimon-be-gone
Roman Donchenko [Tue, 31 Dec 2013 07:40:43 +0000 (11:40 +0400)]
Merge pull request #2094 from SpecLad:multimon-be-gone

10 years agoMerge pull request #2087 from ilya-lavrenov:remap_sse2_cond
Roman Donchenko [Mon, 30 Dec 2013 14:18:41 +0000 (18:18 +0400)]
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond

10 years agoFixed MinGW build by declaring the minimal required Windows version.
Roman Donchenko [Mon, 30 Dec 2013 14:00:29 +0000 (18:00 +0400)]
Fixed MinGW build by declaring the minimal required Windows version.

Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.

This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.

10 years agoMerge pull request #2086 from ilya-lavrenov:mul_fix
Roman Donchenko [Mon, 30 Dec 2013 13:57:43 +0000 (17:57 +0400)]
Merge pull request #2086 from ilya-lavrenov:mul_fix

10 years agoSSE2 optimization of cv::remap doesn't work with big images
Ilya Lavrenov [Sat, 28 Dec 2013 12:28:17 +0000 (16:28 +0400)]
SSE2 optimization of cv::remap doesn't work with big images

10 years agofixed bug #3341
Ilya Lavrenov [Sat, 28 Dec 2013 11:09:45 +0000 (15:09 +0400)]
fixed bug #3341

10 years agoMerge pull request #2092 from alalek:fix_mingw_warn
Roman Donchenko [Mon, 30 Dec 2013 11:34:16 +0000 (15:34 +0400)]
Merge pull request #2092 from alalek:fix_mingw_warn

10 years agoeliminate MINGW pragma warning
Alexander Alekhin [Mon, 30 Dec 2013 08:31:00 +0000 (12:31 +0400)]
eliminate MINGW pragma warning

10 years agoMerge pull request #2083 from jet47:gpu_android_tests
Roman Donchenko [Fri, 27 Dec 2013 17:09:18 +0000 (21:09 +0400)]
Merge pull request #2083 from jet47:gpu_android_tests

10 years agoMerge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
Roman Donchenko [Fri, 27 Dec 2013 16:53:42 +0000 (20:53 +0400)]
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix

10 years agoMerge pull request #2082 from asmorkalov:dynamicuda_internal_fix
Roman Donchenko [Fri, 27 Dec 2013 15:58:57 +0000 (19:58 +0400)]
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix

10 years agoincrease thresholds for some tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:14 +0000 (18:20 +0400)]
increase thresholds for some tests

10 years agodisable 2 problematic tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:01 +0000 (18:20 +0400)]
disable 2 problematic tests

10 years agodisabled GEMM test if library was built without CUBLAS
Vladislav Vinogradov [Fri, 27 Dec 2013 14:19:29 +0000 (18:19 +0400)]
disabled GEMM test if library was built without CUBLAS

10 years agoMerge pull request #2078 from ilya-lavrenov:warn
Roman Donchenko [Fri, 27 Dec 2013 14:17:21 +0000 (18:17 +0400)]
Merge pull request #2078 from ilya-lavrenov:warn

10 years agoBugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
Alexander Smorkalov [Fri, 27 Dec 2013 12:49:26 +0000 (16:49 +0400)]
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.

10 years agodynamicuda became private module.
Alexander Smorkalov [Fri, 27 Dec 2013 13:19:38 +0000 (17:19 +0400)]
dynamicuda became private module.

10 years agoMerge pull request #2072 from pengx17:patch-3
Andrey Pavlenko [Fri, 27 Dec 2013 11:36:24 +0000 (15:36 +0400)]
Merge pull request #2072 from pengx17:patch-3

10 years agofixed warning [-Wempty-body]
Ilya Lavrenov [Fri, 27 Dec 2013 10:44:58 +0000 (14:44 +0400)]
fixed warning [-Wempty-body]

10 years agoMerge pull request #2036 from GregoryMorse:patch-1
Roman Donchenko [Fri, 27 Dec 2013 08:44:02 +0000 (12:44 +0400)]
Merge pull request #2036 from GregoryMorse:patch-1

10 years agoMerge pull request #2074 from asmorkalov:android_nonfree_cuda
Roman Donchenko [Fri, 27 Dec 2013 08:43:49 +0000 (12:43 +0400)]
Merge pull request #2074 from asmorkalov:android_nonfree_cuda

10 years agoMerge pull request #2037 from GregoryMorse:patch-2
Roman Donchenko [Fri, 27 Dec 2013 08:11:51 +0000 (12:11 +0400)]
Merge pull request #2037 from GregoryMorse:patch-2

10 years agoCUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
Alexander Smorkalov [Fri, 27 Dec 2013 07:18:10 +0000 (11:18 +0400)]
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.

10 years agofixed a buffer overrun of ocl canny
Peng Xiao [Fri, 27 Dec 2013 03:54:08 +0000 (11:54 +0800)]
fixed a buffer overrun of ocl canny

the `map` buffer does not have the same size with CUDA and index starts at [1, 1] instead of [0, 0].

10 years agoMerge pull request #2069 from asmorkalov:android_ocl_1_1_fix
Andrey Pavlenko [Thu, 26 Dec 2013 19:07:24 +0000 (23:07 +0400)]
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix

10 years agoMerge pull request #2068 from akarsakov:disable_ipp
Andrey Pavlenko [Thu, 26 Dec 2013 18:41:52 +0000 (22:41 +0400)]
Merge pull request #2068 from akarsakov:disable_ipp

10 years agostatic function qualifier replaced on inline to enable kernel compilation with OpenCL...
Alexander Smorkalov [Thu, 26 Dec 2013 17:20:32 +0000 (21:20 +0400)]
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.

10 years agoDisabled some IPP implementation since it breaks tests
Alexander Karsakov [Thu, 26 Dec 2013 15:53:53 +0000 (19:53 +0400)]
Disabled some IPP implementation since it breaks tests

10 years agoMerge pull request #2061 from apavlenko:2.4_fix_build_vs12
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:56 +0000 (19:38 +0400)]
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12

10 years agoMerge pull request #2064 from dpen2000:patch-2
Roman Donchenko [Thu, 26 Dec 2013 13:47:09 +0000 (17:47 +0400)]
Merge pull request #2064 from dpen2000:patch-2

10 years agoMerge pull request #2057 from asmorkalov:android_cuda_sample
Roman Donchenko [Thu, 26 Dec 2013 12:59:56 +0000 (16:59 +0400)]
Merge pull request #2057 from asmorkalov:android_cuda_sample

10 years agoremoving legacy stuff
Andrey Pavlenko [Thu, 26 Dec 2013 11:49:12 +0000 (15:49 +0400)]
removing legacy stuff

10 years agoUpdate CMakeLists.txt
GregoryMorse [Sun, 22 Dec 2013 16:28:50 +0000 (00:28 +0800)]
Update CMakeLists.txt

WinRT native C++ support allowing building of static libraries

Update CMakeLists.txt

Update OpenCVCRTLinkage.cmake

Update OpenCVCRTLinkage.cmake

10 years agoCUDA support check added.
Alexander Smorkalov [Wed, 25 Dec 2013 13:50:15 +0000 (17:50 +0400)]
CUDA support check added.

10 years agoNew sample for CUDA on Android added.
Alexander Smorkalov [Mon, 23 Dec 2013 11:20:09 +0000 (15:20 +0400)]
New sample for CUDA on Android added.

10 years agoMerge pull request #2060 from asmorkalov:ocv_ts_cuda
Roman Donchenko [Thu, 26 Dec 2013 10:39:51 +0000 (14:39 +0400)]
Merge pull request #2060 from asmorkalov:ocv_ts_cuda

10 years agoFix python sample path
dpen2000 [Thu, 26 Dec 2013 10:36:24 +0000 (10:36 +0000)]
Fix python sample path

10 years agoMerge pull request #2056 from asmorkalov:java_core_cuda_wrappers
Roman Donchenko [Thu, 26 Dec 2013 10:21:21 +0000 (14:21 +0400)]
Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers

10 years agoMerge pull request #2050 from asmorkalov:android_mk_fix2
Roman Donchenko [Thu, 26 Dec 2013 10:16:29 +0000 (14:16 +0400)]
Merge pull request #2050 from asmorkalov:android_mk_fix2

10 years agoeliminating VS2013 build warnings
Andrey Pavlenko [Thu, 26 Dec 2013 09:35:59 +0000 (13:35 +0400)]
eliminating VS2013 build warnings

10 years agoFake dependency from CUDA in case of satic linkage with OpenCV removed.
Alexander Smorkalov [Tue, 24 Dec 2013 12:36:11 +0000 (16:36 +0400)]
Fake dependency from CUDA in case of satic linkage with OpenCV removed.

10 years agoMerge pull request #2052 from SpecLad:seporate
Roman Donchenko [Thu, 26 Dec 2013 08:22:45 +0000 (12:22 +0400)]
Merge pull request #2052 from SpecLad:seporate

10 years agoJava wrappers for functions from cv::gpu namespace in core module added.
Alexander Smorkalov [Wed, 25 Dec 2013 13:10:50 +0000 (17:10 +0400)]
Java wrappers for functions from cv::gpu namespace in core module added.

10 years agoMerge pull request #2049 from asmorkalov:android_cuda_warning_fix
Roman Donchenko [Thu, 26 Dec 2013 08:07:00 +0000 (12:07 +0400)]
Merge pull request #2049 from asmorkalov:android_cuda_warning_fix

10 years agots dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls...
Alexander Smorkalov [Thu, 26 Dec 2013 07:36:00 +0000 (11:36 +0400)]
ts dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls from core module.

10 years agoCUDA warning fix/supporession for Android.
Alexander Smorkalov [Tue, 24 Dec 2013 08:23:50 +0000 (12:23 +0400)]
CUDA warning fix/supporession for Android.

10 years agoDynamic CUDA support library name fixed. Additional error messages added.
Alexander Smorkalov [Thu, 26 Dec 2013 06:16:29 +0000 (10:16 +0400)]
Dynamic CUDA support library name fixed. Additional error messages added.

10 years agoMerge pull request #2017 from pemmanuelviel:flannMemoryLeak
Roman Donchenko [Wed, 25 Dec 2013 15:36:49 +0000 (19:36 +0400)]
Merge pull request #2017 from pemmanuelviel:flannMemoryLeak

10 years agoFixed the seporate/seporator typo everywhere.
Roman Donchenko [Wed, 25 Dec 2013 10:04:44 +0000 (14:04 +0400)]
Fixed the seporate/seporator typo everywhere.

10 years agoMerge pull request #2051 from AlexWillisson:patch-2
Roman Donchenko [Wed, 25 Dec 2013 09:14:13 +0000 (13:14 +0400)]
Merge pull request #2051 from AlexWillisson:patch-2

10 years agoFixed typo in comment
Alex Willisson [Wed, 25 Dec 2013 00:53:50 +0000 (19:53 -0500)]
Fixed typo in comment

10 years agoMerge pull request #2040 from asmorkalov:android_mk_fix
Roman Donchenko [Mon, 23 Dec 2013 14:02:18 +0000 (18:02 +0400)]
Merge pull request #2040 from asmorkalov:android_mk_fix

10 years agoOCV option ENABLE_DYNAMIC_CUDA mistake fix.
Alexander Smorkalov [Mon, 23 Dec 2013 10:42:00 +0000 (14:42 +0400)]
OCV option ENABLE_DYNAMIC_CUDA mistake fix.

10 years agoMerge pull request #2039 from asmorkalov:ocv_version_inc3
Roman Donchenko [Mon, 23 Dec 2013 11:53:11 +0000 (15:53 +0400)]
Merge pull request #2039 from asmorkalov:ocv_version_inc3

10 years agoOpenCV.mk fixed for accurate CUDA support.
Alexander Smorkalov [Mon, 23 Dec 2013 08:33:49 +0000 (12:33 +0400)]
OpenCV.mk fixed for accurate CUDA support.

10 years agoMerge pull request #2022 from asmorkalov:ocv_dynamic_cuda
Roman Donchenko [Mon, 23 Dec 2013 08:45:49 +0000 (12:45 +0400)]
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda

10 years agoOpenCV version++; OpenCV Manager version++.
Alexander Smorkalov [Mon, 23 Dec 2013 07:31:41 +0000 (11:31 +0400)]
OpenCV version++; OpenCV Manager version++.

10 years agoCode review fixes.
Alexander Smorkalov [Fri, 20 Dec 2013 12:32:34 +0000 (16:32 +0400)]
Code review fixes.

10 years agoUpdate system.cpp
GregoryMorse [Sun, 22 Dec 2013 16:21:51 +0000 (00:21 +0800)]
Update system.cpp

Add native C++ support

10 years agoMerge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
Andrey Pavlenko [Sat, 21 Dec 2013 08:44:05 +0000 (12:44 +0400)]
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt

10 years agoMerge pull request #2003 from vbystricky:intelperc_camera_2.4
Roman Donchenko [Fri, 20 Dec 2013 13:06:27 +0000 (17:06 +0400)]
Merge pull request #2003 from vbystricky:intelperc_camera_2.4

10 years agoMerge pull request #1966 from asmorkalov:ocv_neon_support
Roman Donchenko [Fri, 20 Dec 2013 13:04:17 +0000 (17:04 +0400)]
Merge pull request #1966 from asmorkalov:ocv_neon_support

10 years agoMerge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
Andrey Pavlenko [Fri, 20 Dec 2013 12:50:00 +0000 (16:50 +0400)]
Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf

10 years agoNEON instruction set control unified for regular and cross-compiler builds.
Alexander Smorkalov [Tue, 10 Dec 2013 07:22:29 +0000 (11:22 +0400)]
NEON instruction set control unified for regular and cross-compiler builds.

10 years agochange code according reviewer suggesions
krodyush [Fri, 20 Dec 2013 09:51:51 +0000 (13:51 +0400)]
change code according reviewer suggesions

10 years agoRemove TBB ifdef form code
Vladimir Bystricky [Fri, 20 Dec 2013 08:33:39 +0000 (12:33 +0400)]
Remove TBB ifdef form code

10 years agoMerge pull request #1994 from StevenPuttemans:bugfix_3431
Roman Donchenko [Fri, 20 Dec 2013 07:57:29 +0000 (11:57 +0400)]
Merge pull request #1994 from StevenPuttemans:bugfix_3431

10 years agoBuild fixes for case where HAVE_CUDA==OFF.
Alexander Smorkalov [Fri, 20 Dec 2013 05:46:03 +0000 (09:46 +0400)]
Build fixes for case where HAVE_CUDA==OFF.

10 years agoImprove ocl cvt_color performance for the following conversions: RGB<->BGR, RGB-...
krodyush [Thu, 19 Dec 2013 18:56:46 +0000 (22:56 +0400)]
Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
new performance tests were added

10 years agoBuild fixes for GPU module.
Alexander Smorkalov [Thu, 19 Dec 2013 14:36:02 +0000 (18:36 +0400)]
Build fixes for GPU module.

10 years agoWarious fixes for case where HAVE_CUDA==OFF.
Alexander Smorkalov [Thu, 19 Dec 2013 14:02:59 +0000 (18:02 +0400)]
Warious fixes for case where HAVE_CUDA==OFF.

10 years agoAdditional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refacto...
Alexander Smorkalov [Thu, 19 Dec 2013 13:41:04 +0000 (17:41 +0400)]
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.

10 years agoMerge pull request #1765 from ilya-lavrenov:cv_remap
Andrey Pavlenko [Thu, 19 Dec 2013 13:08:52 +0000 (17:08 +0400)]
Merge pull request #1765 from ilya-lavrenov:cv_remap

10 years agoMerge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
Andrey Pavlenko [Thu, 19 Dec 2013 12:46:58 +0000 (16:46 +0400)]
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar

10 years agoMerge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
Andrey Pavlenko [Thu, 19 Dec 2013 12:46:40 +0000 (16:46 +0400)]
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData

10 years agoDynamic CUDA support library reimplemented as OpenCV module.
Alexander Smorkalov [Thu, 19 Dec 2013 12:42:11 +0000 (16:42 +0400)]
Dynamic CUDA support library reimplemented as OpenCV module.

10 years agoMerge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
Andrey Pavlenko [Thu, 19 Dec 2013 12:14:42 +0000 (16:14 +0400)]
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog

10 years agoMerge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft
Andrey Pavlenko [Thu, 19 Dec 2013 09:48:39 +0000 (13:48 +0400)]
Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft

10 years agoMerge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final
Andrey Pavlenko [Thu, 19 Dec 2013 09:38:52 +0000 (13:38 +0400)]
Merge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final

10 years agoCUDA related func tables refactored to remove unneeded dependencies.
Alexander Smorkalov [Thu, 19 Dec 2013 07:18:04 +0000 (11:18 +0400)]
CUDA related func tables refactored to remove unneeded dependencies.

10 years agoFix comment in the cmake file from SSDK to SDK
Vladimir Bystricky [Thu, 19 Dec 2013 06:29:19 +0000 (10:29 +0400)]
Fix comment in the cmake file from SSDK to SDK

10 years agoMake dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
Alexander Smorkalov [Thu, 19 Dec 2013 06:27:38 +0000 (10:27 +0400)]
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.

10 years agoFixes for Android support.
Alexander Smorkalov [Thu, 19 Dec 2013 05:38:46 +0000 (09:38 +0400)]
Fixes for Android support.

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 agointel device guard was added because of perf degradation on some non intel platform.
krodyush [Wed, 18 Dec 2013 10:27:51 +0000 (14:27 +0400)]
intel device guard was added because of perf degradation on some non intel platform.

10 years agoDeviceInfo class method that were implemented in header moved to cpp file.
Alexander Smorkalov [Wed, 18 Dec 2013 08:02:15 +0000 (12:02 +0400)]
DeviceInfo class method that were implemented in header moved to cpp file.

10 years agoDelete end comma in enumerations
Vladimir Bystricky [Wed, 18 Dec 2013 07:46:52 +0000 (11:46 +0400)]
Delete end comma in enumerations

10 years agoAdd CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list
Vladimir Bystricky [Wed, 18 Dec 2013 06:55:09 +0000 (10:55 +0400)]
Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list

10 years agoFix errors in example (samples/cpp/intelperc_capture.cpp)
Vladimir Bystricky [Wed, 18 Dec 2013 05:59:24 +0000 (09:59 +0400)]
Fix errors in example (samples/cpp/intelperc_capture.cpp)

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 agoFix build errors
Vladimir Bystricky [Tue, 17 Dec 2013 14:39:52 +0000 (18:39 +0400)]
Fix build errors