Merge pull request #4064 from MSOpenTech:test-contrib

2015-07-01 10:47:44 +00:00
parent 0ed0f2953a 6a6d58d389
commit 80eec9d531
19 changed files with 303 additions and 21 deletions
--- a/modules/calib3d/test/test_fisheye.cpp
+++ b/modules/calib3d/test/test_fisheye.cpp
@@ -43,6 +43,7 @@
 #include "test_precomp.hpp"
 #include <opencv2/ts/cuda_test.hpp>
 #include "../src/fisheye.hpp"
+#include "opencv2/videoio.hpp"

 class fisheyeTest : public ::testing::Test {