Use strict prototypes.
Merge branch 'master' of https://github.com/ArtanisCV/opencv
Use CV_Assert to replace assert so that MSVC will not produce compilation errors.