Merging master to filter_avx2, and resolving conflicts
authorWoody Chow <woody.chow@mujin.co.jp>
Tue, 16 May 2017 06:34:11 +0000 (15:34 +0900)
committerWoody Chow <woody.chow@mujin.co.jp>
Tue, 16 May 2017 06:34:11 +0000 (15:34 +0900)
commit67fe820c75e0a0c6cf3234e599ee0ab91410341f
tree839252b9ccef824d49774387c4e1373a71269b91
parent9eecb5a9fe86caa5fc0bff64a03013892ce9b7fb
parentfe4555ec7467f095e96263871bf518c4d27f7452
Merging master to filter_avx2, and resolving conflicts
modules/imgproc/src/filter.cpp