Merge pull request #645 from taka-no-me:bump_headers

modules/highgui/src/cap_android.cpp

@@ -43,7 +43,7 @@
 
 #ifdef HAVE_ANDROID_NATIVE_CAMERA
 
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
 #include <pthread.h>
 #include <android/log.h>
 #include <camera_activity.hpp>

modules/highgui/src/cap_avfoundation.mm

@@ -30,7 +30,7 @@
  */
 
 #include "precomp.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 #include <iostream>
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/NSException.h>

modules/highgui/src/cap_ffmpeg_impl.hpp

@@ -59,11 +59,11 @@ extern "C" {
 
 #include "ffmpeg_codecs.hpp"
 
-#include <libavutil/opt.h>
 #include <libavutil/mathematics.h>
 
 #ifdef WIN32
   #define HAVE_FFMPEG_SWSCALE 1
+  #include <libavutil/opt.h>
   #include <libavcodec/avcodec.h>
   #include <libswscale/swscale.h>
 #else

modules/highgui/src/cap_openni.cpp

@@ -39,8 +39,8 @@
 //
 //M*/
 #include "precomp.hpp"
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 
 #ifdef HAVE_OPENNI
 

modules/highgui/src/cap_qtkit.mm

@@ -29,7 +29,7 @@
  */
 
 #include "precomp.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 #include <iostream>
 #import <QTKit/QTKit.h>
 

modules/highgui/src/grfmt_webp.cpp

@@ -51,7 +51,7 @@
 
 #include "grfmt_webp.hpp"
 
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 
 namespace cv
 {

modules/highgui/src/precomp.hpp

@@ -44,7 +44,7 @@
 
 #include "cvconfig.h"
 
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"

modules/highgui/src/window.cpp

@@ -41,7 +41,7 @@
 
 #include "precomp.hpp"
 #include <map>
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 
 // in later times, use this file as a dispatcher to implementations like cvcap.cpp
 

modules/highgui/src/window_w32.cpp

@@ -75,7 +75,7 @@
 #include <algorithm>
 #include <vector>
 #include <functional>
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 #include <GL\gl.h>
 #endif