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

suppress android and mac warnings

Browse Source
This commit is contained in:
laurentBerger
2015-05-16 22:54:53 +02:00
parent 546f70a6f0
commit 268283ff16
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/cpp/detect_mser.cpp
View File

@@ -1,6 +1,6 @@
#include <opencv2/opencv.hpp> #include <opencv2/opencv.hpp>
#include "opencv2/core/opengl.hpp" #include "opencv2/core/opengl.hpp"
#include <cvconfig.h> #include "cvconfig.h"
#include <vector> #include <vector>
#include <map> #include <map>
@@ -212,9 +212,9 @@ static void onMouse(int event, int x, int y, int flags, void*)
} }
#endif #endif
#ifdef HAVE_OPENGL
static void DrawOpenGLMSER(Mat img, Mat result) static 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);
@@ -327,8 +327,8 @@ static void DrawOpenGLMSER(Mat img, Mat result)
} }
setOpenGlDrawCallback("OpenGL", 0, 0); setOpenGlDrawCallback("OpenGL", 0, 0);
destroyAllWindows(); destroyAllWindows();
#endif
} }
#endif
static Mat MakeSyntheticImage() static Mat MakeSyntheticImage()
{ {
@@ -526,7 +526,9 @@ int main(int argc, char *argv[])
cout << "Feature : " << *itDesc << "\n"; cout << "Feature : " << *itDesc << "\n";
cout << e.msg << endl; cout << e.msg << endl;
} }
DrawOpenGLMSER(img,result); #ifdef HAVE_OPENGL
DrawOpenGLMSER(img, result);
#endif
waitKey(); waitKey();
} }
return 0; return 0;