Made dependency of features2d and calib3d from highgui optional

2012-03-13 12:33:16 +00:00
parent d68311b9eb
commit e4307d05f3
8 changed files with 46 additions and 9 deletions
--- a/modules/calib3d/src/checkchessboard.cpp
+++ b/modules/calib3d/src/checkchessboard.cpp
@@ -47,7 +47,12 @@
 //#define DEBUG_WINDOWS

 #if defined(DEBUG_WINDOWS)
-#include "highgui.h"
+#  include "opencv2/opencv_modules.hpp"
+#  ifdef HAVE_OPENCV_HIGHGUI
+#    include "opencv2/highgui/highgui.hpp"
+#  else
+#    undef DEBUG_WINDOWS
+#  endif
 #endif

 void icvGetQuadrangleHypotheses(CvSeq* contours, std::vector<std::pair<float, int> >& quads, int class_id)