ENH: Moved to public version of OpenCV.