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

9 years ago · 07711e404b
parent e15acd4fcf 6a66af72c8
commit 07711e404b
1 changed files with 6 additions and 0 deletions
--- a/modules/stitching/include/opencv2/stitching.hpp
+++ b/modules/stitching/include/opencv2/stitching.hpp
@ -53,6 +53,12 @@
 #include "opencv2/stitching/detail/blenders.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