Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios

5240a032 · Vadim Pisarevsky · a602185f · 6f86c9f1 · 5240a032 · 5240a032
Commit 5240a032 authored Aug 14, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

common.cmake modules/python/common.cmake +1 -0

No files found.
--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp
@@ -43,6 +43,11 @@
 #include "precomp.hpp"
 #include "opencl_kernels_core.hpp"

+#ifdef __APPLE__
+#undef CV_NEON
+#define CV_NEON 0
+#endif
+
 namespace cv
 {


--- a/modules/python/common.cmake
+++ b/modules/python/common.cmake
@@ -21,6 +21,7 @@ ocv_list_filterout(candidate_deps "^opencv_tracking$")
 ocv_list_filterout(candidate_deps "^opencv_optflow$")
 ocv_list_filterout(candidate_deps "^opencv_bgsegm$")
 ocv_list_filterout(candidate_deps "^opencv_xfeatures2d$")
+ocv_list_filterout(candidate_deps "^opencv_ts$")

 ocv_add_module(${MODULE_NAME} BINDINGS OPTIONAL ${candidate_deps})