Merge pull request #3039 from alalek:ocv_world

2014-08-06 14:52:52 +00:00
parent bab5700a09 fc0f254f00
commit ca183707f2
146 changed files with 633 additions and 525 deletions
--- 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
 {