fix compilation problems seen in #11
Merge branch 'master' of https://github.com/Itseez/opencv_contrib