fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge

a37876ab · Vadim Pisarevsky · 12c69ad4 · a37876ab
Commit a37876ab authored Aug 13, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

convert.cpp modules/core/src/convert.cpp +4 -0

No files found.
--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp
@@ -43,6 +43,10 @@
 #include "precomp.hpp"
 #include "opencl_kernels_core.hpp"
+#ifdef __APPLE__
+#undef CV_NEON
+#endif
 namespace cv
 {