Vladislav Vinogradov
|
afd99c9c81
|
fix bug #3544:
add "opencv2/core/utility.hpp" header to precomp.hpp
|
2014-02-18 10:45:47 +04:00 |
|
Ilya Lavrenov
|
37789f015a
|
deleted excess semicolons, commas
|
2014-01-18 01:31:33 +04:00 |
|
Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
Vladislav Vinogradov
|
429bfad225
|
removed precomp.cpp files
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
ae94256edc
|
renmaed gpu module -> cuda
|
2013-09-02 14:00:44 +04:00 |
|