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

2013-03-14 11:42:22 +04:00
parent b076b69e68 a42a0f5fca
commit d9cd753835
281 changed files with 22107 additions and 21404 deletions
--- a/modules/core/src/gl_core_3_1.cpp
+++ b/modules/core/src/gl_core_3_1.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include <sstream>
 #include "cvconfig.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "gl_core_3_1.hpp"

 #ifdef HAVE_OPENGL
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -42,7 +42,7 @@

 #include "precomp.hpp"
 #include "opencv2/core/gpumat.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"

 /****************************************************************************************\
 *                           [scaled] Identity matrix initialization                      *
--- a/modules/core/src/opengl_interop.cpp
+++ b/modules/core/src/opengl_interop.cpp
@@ -41,7 +41,7 @@
 //M*/

 #include "precomp.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 #include "opencv2/core/gpumat.hpp"

 #ifdef HAVE_OPENGL
--- a/modules/core/src/precomp.hpp
+++ b/modules/core/src/precomp.hpp
@@ -47,7 +47,7 @@
 #include "cvconfig.h"
 #endif

-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"