[lives/f32] (2 commits) ...Fix build with OpenCV