fix: some name conflicts. Change calibrate with optional jacobian to calibrate2

release/4.3a0
lvzhaoyang 2015-06-23 02:23:36 -04:00
parent 1c3ab0ce30
commit a37f81fed7
2 changed files with 5 additions and 5 deletions

View File

@ -90,7 +90,7 @@ Point2 Cal3_S2::calibrate(const Point2& p) const {
}
/* ************************************************************************* */
Point2 Cal3_S2::calibrate(const Point2& p, OptionalJacobian<2,5> Dcal,
Point2 Cal3_S2::calibrate2(const Point2& p, OptionalJacobian<2,5> Dcal,
OptionalJacobian<2,2> Dp) const {
const double u = p.x(), v = p.y();
double delta_u = u - u0_, delta_v = v - v0_;

View File

@ -167,7 +167,7 @@ public:
* @param Dp optional 2*2 Jacobian wrpt intrinsic coordinates
* @return point in intrinsic coordinates
*/
Point2 calibrate(const Point2& p, OptionalJacobian<2,5> Dcal = boost::none,
Point2 calibrate2(const Point2& p, OptionalJacobian<2,5> Dcal = boost::none,
OptionalJacobian<2,2> Dp = boost::none) const;
/**