Rok Mandeljc
e0c8721830
samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header, re-introduced TickMeter class in a separate header
...
This patch removes inclusion of opencv2/contrib/contrib.hpp header,
which does not exist anymore due to removal of opencv_contrib module.
The samples including this header appear to be doing so in order to
use TickMeter class; therefore, the latter is now provided by tick_meter.hpp
header file, located in samples/gpu folder.
2014-08-30 01:01:08 +02: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
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
71d61e07b1
renamed gpustereo -> cudastereo
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
d87eb75904
rewrite gpu stereo multi gpu sample:
...
* use different approaches -> threads and streams
* clean up code
2013-08-28 12:41:41 +04:00
Vladislav Vinogradov
98bd401534
fix gpu::DeviceInfo compilation under linux
...
glibc defines major and minor macros
which conflict with gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Vladislav Vinogradov
dd6d58f873
refactored StereoBM
2013-06-14 18:17:30 +04:00
Vladislav Vinogradov
2dab93c2e8
refactored gpu info structures (TargetArchs and DeviceInfo)
...
now DeviceInfo provides full information about device (from cudaDeviceProp)
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
ba1a1aecaa
fixed gpu module compilation
2013-04-09 10:41:35 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Vladislav Vinogradov
d38ca09738
added gpu::printCudaDeviceInfo to all samples
2012-01-30 07:20:09 +00:00
Alexey Spizhevoy
a2090a44db
Updated CLI for GPU samples
2011-10-24 08:34:15 +00:00
Vladislav Vinogradov
f906c9b259
added resetDevice function, removed MultiGpuManager
2011-06-01 10:11:27 +00:00
Vadim Pisarevsky
23768b1826
replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719 )
2011-05-21 18:32:34 +00:00
Marius Muja
7d42dbdd71
Removing 'using namespace std' from header files, closes bugs #730 and #846
2011-02-16 06:36:15 +00:00
Alexey Spizhevoy
04709a2793
refactoring of GPU module
2011-02-15 13:25:24 +00:00
Alexey Spizhevoy
725d83b0e5
added init() function into MultiGpuMgr, added samples
2011-02-15 10:03:26 +00:00
Alexey Spizhevoy
5d4913a2ee
fixed multi GPU API, added driver_api prefix to multi gpu samples
2011-02-15 09:12:48 +00:00
Alexey Spizhevoy
5f175f9594
fixed warnings in GPU samples
2011-02-14 15:36:07 +00:00
Alexey Spizhevoy
a42a42858c
fixed GPU samples and MultiGpuMgr
2011-02-14 15:09:45 +00:00
Alexey Spizhevoy
2a612ca62c
2011-02-14 13:13:05 +00:00
Alexey Spizhevoy
593fae4c02
minor chnages in GPU samples
2011-02-10 14:33:02 +00:00
Alexey Spizhevoy
5c3495a079
added perf test for gpu::erode, fixed docs, refactored perf. sample
2011-02-04 08:16:09 +00:00
Alexey Spizhevoy
50429d8a3e
fixed some warnings and errors under g++
2011-02-03 14:51:58 +00:00
Alexey Spizhevoy
ea94b43541
added stereo_multi_gpu sample, cosmetic changes in multi_gpu sample
2011-02-03 12:02:39 +00:00
