mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 15:20:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7506 from mshabunin:x11-collide-warning

Browse Source
This commit is contained in:
Alexander Alekhin 2016-10-17 19:50:30 +00:00
commit 07711e404b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/stitching/include/opencv2/stitching.hpp
View File

@ -53,6 +53,12 @@
#include "opencv2/stitching/detail/blenders.hpp" #include "opencv2/stitching/detail/blenders.hpp"
#include "opencv2/stitching/detail/camera.hpp" #include "opencv2/stitching/detail/camera.hpp"
#if defined(Status)
# warning Detected X11 'Status' macro definition, it can cause build conflicts. Please, include this header before any X11 headers.
#endif
/** /**
@defgroup stitching Images stitching @defgroup stitching Images stitching