Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 May 2018 11:22:55 +0000 (11:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 May 2018 11:22:55 +0000 (11:22 +0000)
1  2 
modules/calib3d/src/calibinit.cpp
modules/core/include/opencv2/core/cvdef.h
modules/imgproc/include/opencv2/imgproc.hpp
modules/videoio/src/cap.cpp

Simple merge
@@@ -469,9 -455,9 +456,10 @@@ static Ptr<IVideoCapture> IVideoCapture
      for (int i = 0; domains[i] >= 0; i++)
      {
  #if defined(HAVE_GSTREAMER)    || \
+     defined(HAVE_MSMF)         || \
      defined(HAVE_DSHOW)        || \
      defined(HAVE_INTELPERC)    || \
 +    defined(HAVE_LIBREALSENSE) || \
      defined(WINRT_VIDEO)       || \
      defined(HAVE_GPHOTO2)      || \
      (0)