generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made dependency of features2d and calib3d from highgui optional

Browse Source
This commit is contained in:
Andrey Kamaev
2012-03-13 12:33:16 +00:00
parent d68311b9eb
commit e4307d05f3
8 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/calib3d/src/calibinit.cpp
View File

@@ -65,16 +65,22 @@
//#define ENABLE_TRIM_COL_ROW
//#pragma comment(lib, "highgui200d.lib")
//#define DEBUG_CHESSBOARD
#ifdef DEBUG_CHESSBOARD
# include "opencv2/opencv_modules.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
# else
# undef DEBUG_CHESSBOARD
# endif
#endif
#ifdef DEBUG_CHESSBOARD
static int PRINTF( const char* fmt, ... )
{
va_list args;
va_start(args, fmt);
return vprintf(fmt, args);
}
#include "..//..//include/opencv/highgui.h"
#else
static int PRINTF( const char*, ... )
{

7
modules/calib3d/src/checkchessboard.cpp
View File

@@ -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)

7
modules/calib3d/src/circlesgrid.cpp
View File

@@ -44,7 +44,12 @@
//#define DEBUG_CIRCLES
#ifdef DEBUG_CIRCLES
#include "opencv2/highgui/highgui.hpp"
# include "opencv2/opencv_modules.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
# else
# undef DEBUG_CIRCLES
# endif
#endif
using namespace cv;