Merge remote-tracking branch 'upstream/master' into HomographyDecomp

2014-07-30 20:36:41 -04:00
parent 3b608fa489 1a1097ab23
commit 4fe04775d1
971 changed files with 74086 additions and 164430 deletions
--- a/modules/calib3d/test/test_precomp.hpp
+++ b/modules/calib3d/test/test_precomp.hpp
@@ -13,7 +13,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
-#include "opencv2/highgui.hpp"
+#include "opencv2/imgcodecs.hpp"

 namespace cvtest
 {