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

include cvconfig.h to use constant HAVE_OPENGL

Browse Source
This commit is contained in:
laurentBerger 2015-05-16 19:59:59 +02:00
parent 7cf5de0ed0
commit 187ab0ca61
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/cpp/detect_mser.cpp
View File

@ -1,9 +1,11 @@
#include <opencv2/opencv.hpp> #include <opencv2/opencv.hpp>
#include "opencv2/core/opengl.hpp" #include "opencv2/core/opengl.hpp"
#include <cvconfig.h>
#include <vector> #include <vector>
#include <map> #include <map>
#include <iostream> #include <iostream>
#ifdef HAVE_OPENGL
#ifdef WIN32 #ifdef WIN32
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#define NOMINMAX 1 #define NOMINMAX 1
@ -20,7 +22,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
using namespace std; using namespace std;
@ -107,6 +109,7 @@ float obsX = (float)0, obsY = (float)0, obsZ = (float)-10, tx = (float)0, ty = (
float thetaObs = (float)-1.570, phiObs = (float)1.570, rObs = (float)10; float thetaObs = (float)-1.570, phiObs = (float)1.570, rObs = (float)10;
int prevX=-1,prevY=-1,prevTheta=-1000,prevPhi=-1000; int prevX=-1,prevY=-1,prevTheta=-1000,prevPhi=-1000;
#ifdef HAVE_OPENGL
struct DrawData struct DrawData
{ {
@ -208,9 +211,11 @@ static void onMouse(int event, int x, int y, int flags, void*)
} }
} }
#endif
void DrawOpenGLMSER(Mat img, Mat result) void DrawOpenGLMSER(Mat img, Mat result)
{ {
#ifdef HAVE_OPENGL
Mat imgGray; Mat imgGray;
if (img.type() != CV_8UC1) if (img.type() != CV_8UC1)
cvtColor(img, imgGray, COLOR_BGR2GRAY); cvtColor(img, imgGray, COLOR_BGR2GRAY);
@ -323,6 +328,7 @@ void DrawOpenGLMSER(Mat img, Mat result)
} }
setOpenGlDrawCallback("OpenGL", 0, 0); setOpenGlDrawCallback("OpenGL", 0, 0);
destroyAllWindows(); destroyAllWindows();
#endif
} }
Mat MakeSyntheticImage() Mat MakeSyntheticImage()