mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects 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
Show Stats 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/core/opengl.hpp"
#include <cvconfig.h>
#include "cvconfig.h"
#include <vector>
#include <map>
@ -212,9 +212,9 @@ static void onMouse(int event, int x, int y, int flags, void*)
}
#endif
#ifdef HAVE_OPENGL
static void DrawOpenGLMSER(Mat img, Mat result)
{
#ifdef HAVE_OPENGL
Mat imgGray;
if (img.type() != CV_8UC1)
cvtColor(img, imgGray, COLOR_BGR2GRAY);
@ -327,8 +327,8 @@ static void DrawOpenGLMSER(Mat img, Mat result)
}
setOpenGlDrawCallback("OpenGL", 0, 0);
destroyAllWindows();
#endif
}
#endif
static Mat MakeSyntheticImage()
{
@ -526,7 +526,9 @@ int main(int argc, char *argv[])
cout << "Feature : " << *itDesc << "\n";
cout << e.msg << endl;
}
DrawOpenGLMSER(img,result);
#ifdef HAVE_OPENGL
DrawOpenGLMSER(img, result);
#endif
waitKey();
}
return 0;