Added compatibility with trunk opencv

Includes an extra file if OpenCV version is greater than 2.