diff --git a/gtsam/geometry/triangulation.h b/gtsam/geometry/triangulation.h index ed61c75b5..3b58c2943 100644 --- a/gtsam/geometry/triangulation.h +++ b/gtsam/geometry/triangulation.h @@ -124,7 +124,17 @@ std::pair triangulationGraph( return std::make_pair(graph, values); } -/// PinholeCamera specific version // TODO: (chris) why does this exist? +#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 +/// DEPRECATED: PinholeCamera specific version +template +Point3 triangulateNonlinear( + const CameraSet >& cameras, + const Point2Vector& measurements, const Point3& initialEstimate) { + return triangulateNonlinear > // + (cameras, measurements, initialEstimate); +} + +/// DEPRECATED: PinholeCamera specific version template std::pair triangulationGraph( const CameraSet >& cameras, @@ -133,6 +143,7 @@ std::pair triangulationGraph( return triangulationGraph > // (cameras, measurements, landmarkKey, initialEstimate); } +#endif /** * Optimize for triangulation @@ -187,15 +198,6 @@ Point3 triangulateNonlinear( return optimize(graph, values, Symbol('p', 0)); } -/// PinholeCamera specific version // TODO: (chris) why does this exist? -template -Point3 triangulateNonlinear( - const CameraSet >& cameras, - const Point2Vector& measurements, const Point3& initialEstimate) { - return triangulateNonlinear > // - (cameras, measurements, initialEstimate); -} - /** * Create a 3*4 camera projection matrix from calibration and pose. * Functor for partial application on calibration