Merge pull request #9130 from alalek:android_define
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Jul 2017 17:17:24 +0000 (17:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Jul 2017 17:17:24 +0000 (17:17 +0000)
commit5a54acef4e093f3f7cb9f6a54010d7f1247774c6
tree5cd43fb9463418f61776f3fa187d0a1ce6e038eb
parente5fbb4f5d2a0e04e5296bb1eb4b187ab1d163800
parenta4a47b538c027cb83e518bea28bf4af0d9d6c01a
Merge pull request #9130 from alalek:android_define
modules/core/src/stat.cpp
modules/core/test/ocl/test_arithm.cpp
modules/imgproc/src/filter.cpp
modules/imgproc/src/morph.cpp