some more changes in calib3d to make it compile