Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios

2014-08-14 08:51:44 +00:00
parent a602185fb6 6f86c9f118
commit 5240a03217
2 changed files with 6 additions and 0 deletions
--- 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})