From 1c071d8d91d4295523b64280502c6dc76158183b Mon Sep 17 00:00:00 2001 From: David Cattermole Date: Thu, 17 Oct 2024 01:00:02 +1100 Subject: [PATCH] C++ Fix style using clang-format --- lib/cppbind/mmlens/src/distortion_structs.h | 12 ++++++++---- src/mmSolver/adjust/adjust_base.h | 6 +++--- src/mmSolver/shape/ImagePlaneUtils.cpp | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/cppbind/mmlens/src/distortion_structs.h b/lib/cppbind/mmlens/src/distortion_structs.h index 7423c49e..260a4e13 100644 --- a/lib/cppbind/mmlens/src/distortion_structs.h +++ b/lib/cppbind/mmlens/src/distortion_structs.h @@ -86,7 +86,8 @@ class Distortion3deClassic : public Distortion { return mmdata::Vector2D(out_point_dn[0], out_point_dn[1]); } - mmdata::Vector2D map_inverse(const mmdata::Vector2D in_point_dn) const override { + mmdata::Vector2D map_inverse( + const mmdata::Vector2D in_point_dn) const override { ldpk::vec2d out_point_dn = m_distortion.map_inverse( ldpk::vec2d(in_point_dn.x_, in_point_dn.y_)); return mmdata::Vector2D(out_point_dn[0], out_point_dn[1]); @@ -128,7 +129,8 @@ class Distortion3deRadialStdDeg4 : public Distortion { return mmdata::Vector2D(out_point_dn[0], out_point_dn[1]); } - mmdata::Vector2D map_inverse(const mmdata::Vector2D in_point_dn) const override { + mmdata::Vector2D map_inverse( + const mmdata::Vector2D in_point_dn) const override { ldpk::vec2d out_point_dn = m_radial.map_inverse( m_cylindric.eval_inv(ldpk::vec2d(in_point_dn.x_, in_point_dn.y_))); return mmdata::Vector2D(out_point_dn[0], out_point_dn[1]); @@ -183,7 +185,8 @@ class Distortion3deAnamorphicStdDeg4 : public Distortion { return mmdata::Vector2D(out_point_dn[0], out_point_dn[1]); } - mmdata::Vector2D map_inverse(const mmdata::Vector2D in_point_dn) const override { + mmdata::Vector2D map_inverse( + const mmdata::Vector2D in_point_dn) const override { ldpk::vec2d out_point_dn = m_pixel_aspect_and_rotation.eval(m_anamorphic.map_inverse( m_rotation_squeeze_xy_pixel_aspect.eval_inv( @@ -259,7 +262,8 @@ class Distortion3deAnamorphicStdDeg4Rescaled : public Distortion { return mmdata::Vector2D(out_point_dn[0], out_point_dn[1]); } - mmdata::Vector2D map_inverse(const mmdata::Vector2D in_point_dn) const override { + mmdata::Vector2D map_inverse( + const mmdata::Vector2D in_point_dn) const override { ldpk::vec2d out_point_dn = m_pixel_aspect_rescale_and_rotation.eval(m_anamorphic.map_inverse( m_rotation_squeeze_xy_rescale_pixel_aspect.eval_inv( diff --git a/src/mmSolver/adjust/adjust_base.h b/src/mmSolver/adjust/adjust_base.h index b3defc52..dac90f73 100644 --- a/src/mmSolver/adjust/adjust_base.h +++ b/src/mmSolver/adjust/adjust_base.h @@ -94,9 +94,9 @@ bool get_initial_parameters(const int numberOfParameters, bool set_maya_attribute_values( const int numberOfParameters, - std::vector > ¶mToAttrList, const AttrPtrList &attrList, - std::vector ¶mList, MTimeArray &frameList, MDGModifier &dgmod, - MAnimCurveChange &curveChange); + std::vector > ¶mToAttrList, + const AttrPtrList &attrList, std::vector ¶mList, + MTimeArray &frameList, MDGModifier &dgmod, MAnimCurveChange &curveChange); bool compute_error_stats(const int numberOfMarkerErrors, const std::vector &errorDistanceList, diff --git a/src/mmSolver/shape/ImagePlaneUtils.cpp b/src/mmSolver/shape/ImagePlaneUtils.cpp index ff677686..4073c8ab 100644 --- a/src/mmSolver/shape/ImagePlaneUtils.cpp +++ b/src/mmSolver/shape/ImagePlaneUtils.cpp @@ -148,7 +148,8 @@ void calculate_node_camera_size_string(MDagPath &objPath, double width = 0.0; double height = 0.0; - MStatus status = getNodeAttr(objPath, draw_camera_size_attr, out_draw_camera_size); + MStatus status = + getNodeAttr(objPath, draw_camera_size_attr, out_draw_camera_size); CHECK_MSTATUS(status); status = getNodeAttr(objPath, camera_width_inch_attr, width);