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 |
|
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 |
|
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 |
|