Merge pull request #645 from taka-no-me:bump_headers

2013-03-14 11:42:22 +04:00
parent b076b69e68 a42a0f5fca
commit d9cd753835
281 changed files with 22107 additions and 21404 deletions
--- a/modules/stitching/src/matchers.cpp
+++ b/modules/stitching/src/matchers.cpp
@@ -50,7 +50,7 @@ using namespace cv::gpu;
 #endif

 #ifdef HAVE_OPENCV_NONFREE
-#include "opencv2/nonfree/nonfree.hpp"
+#include "opencv2/nonfree.hpp"

 static bool makeUseOfNonfree = initModule_nonfree();
 #endif