generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-14 08:51:44 +00:00
commit 5240a03217
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/convert.cpp
View File

@ -43,6 +43,11 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencl_kernels_core.hpp" #include "opencl_kernels_core.hpp"
#ifdef __APPLE__
#undef CV_NEON
#define CV_NEON 0
#endif
namespace cv namespace cv
{ {

1
modules/python/common.cmake
View File

@ -21,6 +21,7 @@ ocv_list_filterout(candidate_deps "^opencv_tracking$")
ocv_list_filterout(candidate_deps "^opencv_optflow$") ocv_list_filterout(candidate_deps "^opencv_optflow$")
ocv_list_filterout(candidate_deps "^opencv_bgsegm$") ocv_list_filterout(candidate_deps "^opencv_bgsegm$")
ocv_list_filterout(candidate_deps "^opencv_xfeatures2d$") ocv_list_filterout(candidate_deps "^opencv_xfeatures2d$")
ocv_list_filterout(candidate_deps "^opencv_ts$")
ocv_add_module(${MODULE_NAME} BINDINGS OPTIONAL ${candidate_deps}) ocv_add_module(${MODULE_NAME} BINDINGS OPTIONAL ${candidate_deps})