Commit Graph

3 Commits

Author SHA1 Message Date
theodore
9449af8ada 1e-3 -> 1e3 2015-08-17 15:52:16 +02:00
theodore
6d68f72473 bug fix fro the TickMeter class 2015-08-15 14:12:40 +02:00
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