merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/modules/stitching/test/test_matchers.cpp
+++ b/modules/stitching/test/test_matchers.cpp
@@ -40,6 +40,9 @@
 //M*/

 #include "test_precomp.hpp"
+#include "opencv2/opencv_modules.hpp"
+
+#if HAVE_OPENCV_NONFREE

 using namespace cv;
 using namespace std;
@@ -71,3 +74,5 @@ TEST(SurfFeaturesFinder, CanFindInROIs)
    ASSERT_GT(br_rect_count, 0);
    ASSERT_EQ(bad_count, 0);
 }
+
+#endif