Using cv::String instead of std::string.
Merge branch 'branch_ocl_instrumentation' of https://github.com/philippefoubert/opencv.git