generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header, re-introduced TickMeter class in a separate header

Browse Source 
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.
This commit is contained in:
Rok Mandeljc
2014-08-30 00:00:11 +02:00
parent 8908b22c9d
commit e0c8721830
7 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/gpu/video_reader.cpp
View File

@@ -13,7 +13,8 @@
#include <opencv2/core/opengl.hpp>
#include <opencv2/cudacodec.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/contrib.hpp>
#include "tick_meter.hpp"
int main(int argc, const char* argv[])
{
@@ -32,7 +33,7 @@ int main(int argc, const char* argv[])
cv::cuda::GpuMat d_frame;
cv::Ptr<cv::cudacodec::VideoReader> d_reader = cv::cudacodec::createVideoReader(fname);
cv::TickMeter tm;
TickMeter tm;
std::vector<double> cpu_times;
std::vector<double> gpu_times;