Seunghoon Park
7868733002
fixing bug #3345
...
(cherry picked from commit b036fc756a
)
2014-02-10 15:48:50 +04:00
Ilya Lavrenov
469aef2e5e
fixed bug #3341
...
(cherry picked from commit 09d25e11c6
)
2014-02-10 15:48:50 +04:00
Roman Donchenko
5e00fc6afe
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.
(cherry picked from commit 795c108f2b
)
2014-02-10 15:48:50 +04:00
Vladislav Vinogradov
5170f0b5da
fixed several bugs in CUDA Canny implementation:
...
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd(cherry picked from commit 5dbdadb769
)
2014-02-07 20:59:13 +04:00
Vladislav Vinogradov
dc2dbb4173
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
.
(cherry picked from commit bfc27271e2
)
2014-02-07 20:58:49 +04:00
Vladislav Vinogradov
79e4f7eb78
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c
.
(cherry picked from commit 5d099df578
)
2014-02-07 18:24:57 +04:00
Vladislav Vinogradov
cc73c7000f
fix epsilons for several gpu tests
...
(cherry picked from commit 3e4bb371c8
)
2014-02-07 18:24:44 +04:00
Vladislav Vinogradov
8bb26fa5de
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a853
.
(cherry picked from commit b6ba1f226c
)
2014-02-07 18:24:35 +04:00
Vladislav Vinogradov
48612d7c58
Revert "disable gpu Subtract_Array test:"
...
This reverts commit e91bf95d58
.
(cherry picked from commit da44a2fac1
)
2014-02-07 18:24:23 +04:00
Vladislav Vinogradov
4425dac7f4
disable gpu CvtColor.*2HSV tests:
...
possible bug in CPU version(cherry picked from commit 3cb8b352e52f85847d98d2b0ece32ba5bdb5c31b)
2014-01-31 22:24:20 +04:00
Vladislav Vinogradov
4f79b9de48
disable gpu Subtract_Array test:
...
possible bug in CPU version(cherry picked from commit 59155c1eefb6f22e362e34a8d73b31841eb3413a)
2014-01-31 22:23:55 +04:00
Vladislav Vinogradov
397ac5e68f
disable gpu Canny and HoughCircles perf tests:
...
it fails because driver terminates CUDA kernels after time out
(cherry picked from commit fa5bbb5f8dc1a86cfe004fb258d66e56c90560d6)
2014-01-31 22:23:39 +04:00
Vladislav Vinogradov
43c75c64b5
disable NPP for GpuMat methods and for copyMakeBorder(cherry picked from commit 316d49fc0fb7a609ebb0a65efc207faea6b978a4)
2014-01-31 22:23:22 +04:00
Vladislav Vinogradov
c319625a07
disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c)
2014-01-31 22:23:05 +04:00
Vladislav Vinogradov
a7d0448faa
gpu test output files moved from cwd to temp folder(cherry picked from commit 49731ad530
)
2014-01-31 22:22:49 +04:00
Alexander Smorkalov
ca10e5e8ae
Highgui test output fixes.
...
Useless output to console fixed;
Test output files moved from cwd to temp folder.
(cherry picked from commit 87935f3560
)
2014-01-31 22:22:33 +04:00
Vladislav Vinogradov
32414afe72
disable performance test for gpu generalized hough(cherry picked from commit 063d8b4211
)
2014-01-31 22:22:14 +04:00
Alexander Smorkalov
3ebdcafdd3
All installed files marked with component names for install customization.
...
(cherry picked from commit b75cbfde45
)
Conflicts:
cmake/OpenCVModule.cmake
2014-01-24 17:13:22 +04:00
Alexander Smorkalov
a348f3eeaa
OpenCV version++
2014-01-24 14:49:56 +04:00
Vladislav Vinogradov
e9638d0997
disable CUDA generalized Hough Transform
...
(cherry picked from commit 33d42b740c
)
2014-01-24 14:46:36 +04:00
Vladislav Vinogradov
5cb0084547
split CUDA Hough sources
...
(cherry picked from commit d847387694
)
2014-01-24 14:46:16 +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