Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Kazuki Matsuda
2ae20c74a2
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
2014-01-06 02:24:14 +09:00
Pierre-Emmanuel Viel
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
2014-01-03 13:16:36 +01:00
Nghia Ho
d3e24f3cbf
Improved documentation for neural network
2014-01-03 14:18:07 +11:00
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
2013-12-31 11:40:44 +04:00
Seunghoon Park
b036fc756a
fixing bug #3345
2013-12-30 21:10:06 -05:00
Roman Donchenko
4ce684e61c
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
2013-12-30 18:18:42 +04:00
Roman Donchenko
795c108f2b
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.
2013-12-30 18:13:42 +04:00
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
2013-12-30 17:57:43 +04:00
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
2013-12-30 17:13:40 +04:00
Ilya Lavrenov
09d25e11c6
fixed bug #3341
2013-12-30 16:47:54 +04:00
Alexander Alekhin
44970ddf56
eliminate MINGW pragma warning
2013-12-30 12:31:00 +04:00
Roman Donchenko
05b9c991dd
Merge pull request #2083 from jet47:gpu_android_tests
2013-12-27 21:09:18 +04:00
Roman Donchenko
46be47cb4b
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
2013-12-27 20:53:42 +04:00
Roman Donchenko
4eb9b9d6cf
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
2013-12-27 19:58:57 +04:00
Vladislav Vinogradov
53494ba397
increase thresholds for some tests
2013-12-27 18:20:14 +04:00
Vladislav Vinogradov
15678efe84
disable 2 problematic tests
2013-12-27 18:20:01 +04:00
Vladislav Vinogradov
8399568edf
disabled GEMM test if library was built without CUBLAS
2013-12-27 18:19:29 +04:00
Roman Donchenko
0566ab4d3d
Merge pull request #2078 from ilya-lavrenov:warn
2013-12-27 18:17:21 +04:00
Alexander Smorkalov
df63060e4d
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
2013-12-27 18:04:10 +04:00
Alexander Smorkalov
4175916b2a
dynamicuda became private module.
2013-12-27 17:19:38 +04:00
Andrey Pavlenko
d649f47eeb
Merge pull request #2072 from pengx17:patch-3
2013-12-27 15:36:24 +04:00
Ilya Lavrenov
d014cb8fb4
fixed warning [-Wempty-body]
2013-12-27 14:44:58 +04:00
Roman Donchenko
c45492371a
Merge pull request #2036 from GregoryMorse:patch-1
2013-12-27 12:44:02 +04:00
Roman Donchenko
719149877e
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
2013-12-27 12:43:49 +04:00
Roman Donchenko
ee36717db4
Merge pull request #2037 from GregoryMorse:patch-2
2013-12-27 12:11:52 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
Peng Xiao
0ccc903647
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].
2013-12-27 11:54:08 +08:00
Andrey Pavlenko
41fd711ab0
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
2013-12-26 23:07:25 +04:00
Andrey Pavlenko
4b885e2067
Merge pull request #2068 from akarsakov:disable_ipp
2013-12-26 22:41:52 +04:00
Alexander Smorkalov
4f6f6e8cac
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
2013-12-26 21:20:32 +04:00
Alexander Karsakov
6ef0253fb7
Disabled some IPP implementation since it breaks tests
2013-12-26 19:53:53 +04:00
Andrey Pavlenko
f7b5e6544f
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
2013-12-26 19:38:57 +04:00
Roman Donchenko
648facccd6
Merge pull request #2064 from dpen2000:patch-2
2013-12-26 17:47:09 +04:00
Andrey Pavlenko
734bf8babd
removing legacy stuff
2013-12-26 15:49:12 +04:00
GregoryMorse
4880858119
Update CMakeLists.txt
...
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
2013-12-26 19:45:21 +08:00
Roman Donchenko
60906d9175
Merge pull request #2060 from asmorkalov:ocv_ts_cuda
2013-12-26 14:39:51 +04:00
dpen2000
d6a88397b4
Fix python sample path
2013-12-26 10:36:24 +00:00
Roman Donchenko
8fe79738ce
Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers
2013-12-26 14:21:21 +04:00
Andrey Pavlenko
f9aa148ba9
eliminating VS2013 build warnings
2013-12-26 13:35:59 +04:00
Alexander Smorkalov
e79c875fe2
Java wrappers for functions from cv::gpu namespace in core module added.
2013-12-26 12:13:23 +04:00
Roman Donchenko
24be7b26cd
Merge pull request #2049 from asmorkalov:android_cuda_warning_fix
2013-12-26 12:07:01 +04:00
Alexander Smorkalov
0206f419c1
ts dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls from core module.
2013-12-26 11:36:00 +04:00
Alexander Smorkalov
1e038e2837
CUDA warning fix/supporession for Android.
2013-12-26 10:17:38 +04:00
Alexander Smorkalov
4aa9f83100
Dynamic CUDA support library name fixed. Additional error messages added.
2013-12-26 10:16:29 +04:00
Roman Donchenko
1acc1085d2
Merge pull request #2017 from pemmanuelviel:flannMemoryLeak
2013-12-25 19:36:49 +04:00
Alex Willisson
4293a54447
Fixed typo in comment
2013-12-24 19:53:50 -05:00
Roman Donchenko
edce617a58
Merge pull request #2040 from asmorkalov:android_mk_fix
2013-12-23 18:02:18 +04:00
Alexander Smorkalov
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
2013-12-23 16:40:31 +04:00
Roman Donchenko
83cdd43a4c
Merge pull request #2039 from asmorkalov:ocv_version_inc3
2013-12-23 15:53:11 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Alexander Smorkalov
bc72f4d2a2
Code review fixes.
2013-12-23 11:34:46 +04:00
GregoryMorse
08d8faf9da
Update system.cpp
...
Add native C++ support
2013-12-23 00:21:51 +08:00
Andrey Pavlenko
f9268d34dc
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
2013-12-21 12:44:06 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Andrey Pavlenko
6b7d890f34
Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
2013-12-20 16:50:00 +04:00
krodyush
e8dd31aacd
change code according reviewer suggesions
2013-12-20 13:51:51 +04:00
Vladimir Bystricky
d6a7e8f84f
Remove TBB ifdef form code
2013-12-20 12:33:39 +04:00
Alexander Smorkalov
529bd41751
Build fixes for case where HAVE_CUDA==OFF.
2013-12-20 11:37:15 +04:00
krodyush
27c1bd2762
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
2013-12-19 22:56:46 +04:00
Alexander Smorkalov
069f3d8d9a
Build fixes for GPU module.
2013-12-19 19:12:18 +04:00
Alexander Smorkalov
2509fa8080
Warious fixes for case where HAVE_CUDA==OFF.
2013-12-19 18:02:59 +04:00
Alexander Smorkalov
5a5c82bb1d
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.
2013-12-19 17:41:04 +04:00
Andrey Pavlenko
26f5d2d639
Merge pull request #1765 from ilya-lavrenov:cv_remap
2013-12-19 17:08:52 +04:00
Andrey Pavlenko
b674cd8571
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
2013-12-19 16:46:58 +04:00
Andrey Pavlenko
8c91a1af71
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
2013-12-19 16:46:40 +04:00
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
2013-12-19 16:42:11 +04:00
Andrey Pavlenko
22a3cf0fba
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
2013-12-19 16:14:42 +04:00
Andrey Pavlenko
0cea828a10
Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft
2013-12-19 13:48:40 +04:00
Andrey Pavlenko
bc741ab25f
Merge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final
2013-12-19 13:38:52 +04:00
Alexander Smorkalov
64c94cb22c
CUDA related func tables refactored to remove unneeded dependencies.
2013-12-19 11:18:04 +04:00
Alexander Smorkalov
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
2013-12-19 10:27:38 +04:00
Alexander Smorkalov
442082eb0f
Fixes for Android support.
2013-12-19 09:38:46 +04:00
Pierre-Emmanuel Viel
92fc763925
Fix some memory leaks in HierarchicalClusteringIndex
2013-12-18 22:46:41 +01:00
Andrey Pavlenko
459e7d4a80
Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill
2013-12-18 19:13:22 +04:00
Andrey Pavlenko
a9687a341e
adding more than 4 channels random Mats support
...
if `Scalar:all` is used, Mats with 5+ channels cause errors
2013-12-18 17:27:39 +04:00
krodyush
1ae71fe205
intel device guard was added because of perf degradation on some non intel platform.
2013-12-18 14:27:51 +04:00
Alexander Smorkalov
be530bd085
DeviceInfo class method that were implemented in header moved to cpp file.
2013-12-18 12:02:15 +04:00
Vladimir Bystricky
80d0593dbd
Delete end comma in enumerations
2013-12-18 11:46:52 +04:00
Vladimir Bystricky
66145ea06c
Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list
2013-12-18 10:55:09 +04:00
krodyush
34c630faf4
update doc to be consisted with headers
2013-12-17 17:46:09 +04:00
Ilya Lavrenov
3a6d248bee
typo
2013-12-17 17:41:28 +04:00
krodyush
ea0c9b7f5c
GFFT fix for linux build
2013-12-17 17:12:57 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
krodyush
fffac2f085
optimize SURF by
...
Inlining and customizing sampling functions to reduce memory traffic and compute
Improve calcOrientation implementation.
Using more efficient rounding routines.
Removing unnecessary use of local memory
2013-12-17 14:12:33 +04:00
krodyush
dfe7c98090
optimize separable filter by
...
Added "sep_filter_singlepass" kernel that performs separable filtering in one kernel call
Added appropriate host part - sepFilter2D_SinglePass function and SingleStepSeparableFilterEngine_GPU class
Changed function declarations to enable their usage
2013-12-17 14:09:06 +04:00
krodyush
f3ee1c3d2f
Changes the datatype of the angle of the gradient for Intel platforms.
2013-12-17 14:06:14 +04:00
krodyush
917b883cf0
remove extra calculations from haar to be consistent with native implementation
2013-12-17 14:04:10 +04:00
krodyush
a63576e76d
HOST side optimization for GFFT
2013-12-17 14:02:57 +04:00
krodyush
de431609db
optimize Dx and Dy calcualtion to make it as single opencl kernel
2013-12-17 14:01:01 +04:00
Roman Donchenko
5d5527d03e
Merge pull request #1987 from pentschev:cv_completesymm_template_2.4
2013-12-17 13:17:25 +04:00
Vladimir Bystricky
4088013251
Add set/get depth generator properties by default. Add documentation
2013-12-17 12:00:40 +04:00
Alexander Smorkalov
88a883e68e
Build fix.
2013-12-17 10:24:00 +04:00
Alexander Smorkalov
8660e048bc
Dynamic CUDA support library loading implemented for Linux.
...
Logical mistake in macro fixed;
DeviceInfo deligate reimplemented;
Build and warning fixes.
2013-12-16 14:46:44 +04:00
Alexander Smorkalov
d4087f19a2
All CUDA related stuff were moved to separate dynamic library.
2013-12-16 14:46:44 +04:00
Peter Andreas Entschev
f44de302a0
cv::completeSymm fixed to work with any OpenCV data type and multiple channels.
2013-12-15 20:56:55 -02:00