Roman Donchenko
|
4eb9b9d6cf
|
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
|
2013-12-27 19:58:57 +04:00 |
|
Roman Donchenko
|
0566ab4d3d
|
Merge pull request #2078 from ilya-lavrenov:warn
|
2013-12-27 18:17:21 +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 |
|
Roman Donchenko
|
709e8e8e07
|
Merge pull request #2057 from asmorkalov:android_cuda_sample
|
2013-12-26 16:59:56 +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 |
|
Alexander Smorkalov
|
cea9a97434
|
CUDA support check added.
|
2013-12-26 14:52:41 +04:00 |
|
Alexander Smorkalov
|
b3eee49451
|
New sample for CUDA on Android added.
|
2013-12-26 14:52:41 +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 |
|
Roman Donchenko
|
86aabf704f
|
Merge pull request #2050 from asmorkalov:android_mk_fix2
|
2013-12-26 14:16:29 +04:00 |
|
Andrey Pavlenko
|
f9aa148ba9
|
eliminating VS2013 build warnings
|
2013-12-26 13:35:59 +04:00 |
|
Alexander Smorkalov
|
358e59e91b
|
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
|
2013-12-26 13:07:53 +04:00 |
|
Roman Donchenko
|
b94963d381
|
Merge pull request #2052 from SpecLad:seporate
|
2013-12-26 12:22:46 +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 |
|
Roman Donchenko
|
83fe2f3b16
|
Fixed the seporate/seporator typo everywhere.
|
2013-12-25 14:04:44 +04:00 |
|
Roman Donchenko
|
1e27b07e29
|
Merge pull request #2051 from AlexWillisson:patch-2
|
2013-12-25 13:14:14 +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 |
|
Alexander Smorkalov
|
58e7d9f32f
|
OpenCV.mk fixed for accurate CUDA support.
|
2013-12-23 12:58:12 +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 |
|
Roman Donchenko
|
ce07840e9f
|
Merge pull request #1966 from asmorkalov:ocv_neon_support
|
2013-12-20 17:04:17 +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 |
|
Alexander Smorkalov
|
9941c6710d
|
NEON instruction set control unified for regular and cross-compiler builds.
|
2013-12-20 16:02:37 +04:00 |
|