few changes for compilation
Merge branch 'master' of https://github.com/f-morozov/opencv