Fix the problem of haar caused by merge
Merge pull request #1164 from bitwangyaoyao:master_fixHaar