Roman Donchenko
|
cdc10defa3
|
Merge commit '05b9c991dd' into merge-2.4
Conflicts:
modules/cuda/test/test_objdetect.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_core.cpp
|
2013-12-30 17:30:59 +04:00 |
|
Vladislav Vinogradov
|
5ea8085220
|
added BufferPool class
|
2013-10-08 17:20:29 +04:00 |
|
Vladislav Vinogradov
|
988ab79acb
|
added BufferAllocator
|
2013-10-08 17:20:20 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
ae94256edc
|
renmaed gpu module -> cuda
|
2013-09-02 14:00:44 +04:00 |
|