potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 'cuda_concurrency' into tvl1_chambolle

Browse Source
This commit is contained in:
Ernest Galbrun
2014-07-31 16:08:57 +02:00
parent 5623701acb ae26368e78
commit 7b8bb4248b
437 changed files with 10444 additions and 13214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/video/perf/perf_precomp.hpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include "opencv2/ts.hpp"
#include <opencv2/imgproc.hpp>
#include <opencv2/video.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/imgcodecs.hpp>
#ifdef GTEST_CREATE_SHARED_LIBRARY
#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
modules/video/test/test_precomp.hpp
+1 -1
View File
@@ -13,6 +13,6 @@
#include "opencv2/ts.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/video.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgcodecs.hpp"
#endif