fix calib3d changes in #6836 plus some others
fix calib3d changes in #6836 plus some others

opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv