From a37876ab9531cf358a0c143f12f102158d6d28e6 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Wed, 13 Aug 2014 19:59:26 +0400 Subject: [PATCH] fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge --- modules/core/src/convert.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index 61499b3..6362475 100644 --- 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 { -- 2.7.4