fix bug #2787
linux warning fix
Merge pull request #585 from bitwangyaoyao:2.4_SURF