Merge pull request opencv#3463 from Dikay900:fix_sample_video_writer

vpisarev · vpisarev · commit 46858c432824 · 2014-12-02T09:04:27.000Z
diff --git a/samples/gpu/video_writer.cpp b/samples/gpu/video_writer.cpp
@@ -11,6 +11,8 @@
 #include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"
 
+#include "tick_meter.hpp"
+
 int main(int argc, const char* argv[])
 {
     if (argc != 2)
@@ -39,7 +41,7 @@ int main(int argc, const char* argv[])
 
     std::vector<double> cpu_times;
     std::vector<double> gpu_times;
-    cv::TickMeter tm;
+    TickMeter tm;
 
     for (int i = 1;; ++i)
     {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`#include "opencv2/cudacodec.hpp"`
`12`	`12`	`#include "opencv2/highgui.hpp"`
`13`	`13`
	`14`	`+#include "tick_meter.hpp"`
	`15`	`+`
`14`	`16`	`int main(int argc, const char* argv[])`
`15`	`17`	`{`
`16`	`18`	`if (argc != 2)`
`@@ -39,7 +41,7 @@ int main(int argc, const char* argv[])`
`39`	`41`
`40`	`42`	`std::vector<double> cpu_times;`
`41`	`43`	`std::vector<double> gpu_times;`
`42`		`- cv::TickMeter tm;`
	`44`	`+ TickMeter tm;`
`43`	`45`
`44`	`46`	`for (int i = 1;; ++i)`
`45`	`47`	`{`