projects / profile / ivi / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8908b22) | patch
samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header...
authorRok Mandeljc <rok.mandeljc@gmail.com>
Fri, 29 Aug 2014 22:00:11 +0000 (00:00 +0200)
committerRok Mandeljc <rok.mandeljc@gmail.com>
Fri, 29 Aug 2014 23:01:08 +0000 (01:01 +0200)
commite0c8721830f7bca0873f40c9938e5af81e887e19
treeab0fca5bface822967d7b44549d9f2df45b9f743tree | snapshot
parent8908b22c9d51ce8552e4220d2b73349f89776366commit | diff
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.
samples/gpu/cascadeclassifier.cpp diff | blob | history
samples/gpu/generalized_hough.cpp diff | blob | history
samples/gpu/stereo_multi.cpp diff | blob | history
samples/gpu/super_resolution.cpp diff | blob | history
samples/gpu/tick_meter.hpp [new file with mode: 0644] blob
samples/gpu/video_reader.cpp diff | blob | history
samples/gpu/video_writer.cpp diff | blob | history
Domain: Multimedia / Uncategorized;