world fix

2014-08-01 18:11:20 +04:00
parent d2f1c00719
commit 55188fe991
146 changed files with 630 additions and 525 deletions
--- a/modules/core/src/arithm.cpp
+++ b/modules/core/src/arithm.cpp
@@ -47,7 +47,7 @@
 // */

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 namespace cv
 {
--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp
@@ -41,7 +41,7 @@
 //M*/

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 namespace cv
 {
--- a/modules/core/src/copy.cpp
+++ b/modules/core/src/copy.cpp
@@ -46,7 +46,7 @@
 // */

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 namespace cv
 {
--- a/modules/core/src/dxt.cpp
+++ b/modules/core/src/dxt.cpp
@@ -42,7 +42,7 @@
 #include "precomp.hpp"
 #include "opencv2/core/opencl/runtime/opencl_clamdfft.hpp"
 #include "opencv2/core/opencl/runtime/opencl_core.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"
 #include <map>

 namespace cv
--- a/modules/core/src/mathfuncs.cpp
+++ b/modules/core/src/mathfuncs.cpp
@@ -41,7 +41,7 @@
 //M*/

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 namespace cv
 {
--- a/modules/core/src/matmul.cpp
+++ b/modules/core/src/matmul.cpp
@@ -41,7 +41,7 @@
 //M*/

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"
 #include "opencv2/core/opencl/runtime/opencl_clamdblas.hpp"

 namespace cv
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -41,7 +41,7 @@
 //M*/

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 #include "bufferpool.impl.hpp"

--- a/modules/core/src/opencl/runtime/opencl_clamdblas.cpp
+++ b/modules/core/src/opencl/runtime/opencl_clamdblas.cpp
@@ -39,7 +39,7 @@
 //
 //M*/

-#include "precomp.hpp"
+#include "../../precomp.hpp"

 #ifdef HAVE_CLAMDBLAS

--- a/modules/core/src/opencl/runtime/opencl_clamdfft.cpp
+++ b/modules/core/src/opencl/runtime/opencl_clamdfft.cpp
@@ -39,7 +39,7 @@
 //
 //M*/

-#include "precomp.hpp"
+#include "../../precomp.hpp"

 #ifdef HAVE_CLAMDFFT

--- a/modules/core/src/opencl/runtime/opencl_core.cpp
+++ b/modules/core/src/opencl/runtime/opencl_core.cpp
@@ -39,7 +39,7 @@
 //
 //M*/

-#include "precomp.hpp"
+#include "../../precomp.hpp"

 #if defined(HAVE_OPENCL) && !defined(HAVE_OPENCL_STATIC)

--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@@ -44,7 +44,7 @@
 #include <climits>
 #include <limits>

-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 namespace cv
 {
--- a/modules/core/src/umatrix.cpp
+++ b/modules/core/src/umatrix.cpp
@@ -41,7 +41,7 @@
 //M*/

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_core.hpp"

 ///////////////////////////////// UMat implementation ///////////////////////////////