merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

modules/contrib/CMakeLists.txt

@@ -1 +1 @@
-ocv_define_module(contrib opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui opencv_ml opencv_video opencv_objdetect)
+ocv_define_module(contrib opencv_imgproc opencv_calib3d opencv_features2d opencv_ml opencv_video opencv_objdetect OPTIONAL opencv_highgui)

modules/contrib/src/chamfermatching.cpp

@@ -44,7 +44,10 @@
 //
 
 #include "precomp.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/opencv_modules.hpp"
+#ifdef HAVE_OPENCV_HIGHGUI
+#  include "opencv2/highgui/highgui.hpp"
+#endif
 #include <iostream>
 #include <queue>
 
@@ -907,13 +910,16 @@ void ChamferMatcher::Template::show() const
         }
     }
 
-
     circle(templ_color,Point(center.x + pad, center.y + pad),1,CV_RGB(0,255,0));
 
+#ifdef HAVE_OPENCV_HIGHGUI
     namedWindow("templ",1);
     imshow("templ",templ_color);
 
     cvWaitKey(0);
+#else
+    CV_Error(CV_StsNotImplemented, "OpenCV has been compiled without GUI support");
+#endif
 
     templ_color.release();
 }

modules/contrib/src/rgbdodometry.cpp

@@ -39,10 +39,16 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
+
+#define SHOW_DEBUG_IMAGES 0
+
 #include "opencv2/core/core.hpp"
 #include "opencv2/calib3d/calib3d.hpp"
 
-#include "opencv2/highgui/highgui.hpp"
+#if SHOW_DEBUG_IMAGES
+#  include "opencv2/highgui/highgui.hpp"
+#endif
+
 #include "precomp.hpp"
 
 #include <iostream>
@@ -58,7 +64,6 @@
 
 #include <limits>
 
-#define SHOW_DEBUG_IMAGES 0
 using namespace cv;
 
 inline static