diff --git a/ChangeLog.md b/ChangeLog.md index a6059503..ac3ce7e1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixes +- Fixed typo in RGBInfoV1, TOFInfoV4 and TOFInfoV3: extrisic_optic_to_user -> extrinsic_optic_to_user ## 1.2.3 - 2023-03-17 ### Fixes diff --git a/modules/deserialize/include/ifm3d/deserialize/struct_rgb_info_v1.hpp b/modules/deserialize/include/ifm3d/deserialize/struct_rgb_info_v1.hpp index 1feee8ef..86cfcf34 100644 --- a/modules/deserialize/include/ifm3d/deserialize/struct_rgb_info_v1.hpp +++ b/modules/deserialize/include/ifm3d/deserialize/struct_rgb_info_v1.hpp @@ -49,8 +49,8 @@ namespace ifm3d timestamp_ns = mkval(start_ptr + RGB_INFO_TIMESTAMPS_INDEX); exposure_time = mkval(start_ptr + RGB_INFO_EXPOSURE_TIMES_INDEX); - extrisic_optic_to_user.Read(start_ptr + - RGB_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX); + extrinsic_optic_to_user.Read(start_ptr + + RGB_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX); intrinsic_calibration.Read(start_ptr + RGB_INFO_INTRINSIC_CALIBRATION_INDEX); inverse_intrinsic_calibration.Read( @@ -66,7 +66,7 @@ namespace ifm3d /*@brief Actual exposure time of the 2D image*/ float exposure_time; /*@brief Extrinsic optic paramter of the 2D head*/ - calibration::ExtrinsicOpticToUser extrisic_optic_to_user; + calibration::ExtrinsicOpticToUser extrinsic_optic_to_user; /*@brief Intrinsic Calibration parameters*/ calibration::IntrinsicCalibration intrinsic_calibration; /*@brief Inverse intrinsic Calibration parameters*/ diff --git a/modules/deserialize/include/ifm3d/deserialize/struct_tof_info_v3.hpp b/modules/deserialize/include/ifm3d/deserialize/struct_tof_info_v3.hpp index dc71a90d..99540e5e 100644 --- a/modules/deserialize/include/ifm3d/deserialize/struct_tof_info_v3.hpp +++ b/modules/deserialize/include/ifm3d/deserialize/struct_tof_info_v3.hpp @@ -55,8 +55,8 @@ namespace ifm3d mkval(start_ptr + TOF_INFO_AMPLITUDE_RESOLUTION_INDEX); mkarray(start_ptr + TOF_INFO_AMPLITUDE_NORM_FACTOR_INDEX, amp_normalization_factors); - extrisic_optic_to_user.Read(start_ptr + - TOF_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX); + extrinsic_optic_to_user.Read(start_ptr + + TOF_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX); intrinsic_calibration.Read(start_ptr + TOF_INFO_INTRINSIC_CALIBRATION_INDEX); inverse_intrinsic_calibration.Read( @@ -80,7 +80,7 @@ namespace ifm3d * times*/ std::array amp_normalization_factors; /*@brief Extrinsic optic parameter to user*/ - calibration::ExtrinsicOpticToUser extrisic_optic_to_user; + calibration::ExtrinsicOpticToUser extrinsic_optic_to_user; /*@brief Intrinsic calibration parameters*/ calibration::IntrinsicCalibration intrinsic_calibration; /*@brief Inverse intrinsic calibration parameters*/ diff --git a/modules/deserialize/test/ifm3d-deserialize-tests.cpp b/modules/deserialize/test/ifm3d-deserialize-tests.cpp index c32a09cb..d21ae1a6 100644 --- a/modules/deserialize/test/ifm3d-deserialize-tests.cpp +++ b/modules/deserialize/test/ifm3d-deserialize-tests.cpp @@ -45,12 +45,12 @@ TEST(DeserializeTestWithFile, struct_tof_info_v3) ifm3d::tof_info::amp_normalization_factors)); std::array extrinc_opt_to_user = { - tof_info_v3.extrisic_optic_to_user.trans_x, - tof_info_v3.extrisic_optic_to_user.trans_y, - tof_info_v3.extrisic_optic_to_user.trans_z, - tof_info_v3.extrisic_optic_to_user.rot_x, - tof_info_v3.extrisic_optic_to_user.rot_y, - tof_info_v3.extrisic_optic_to_user.rot_z}; + tof_info_v3.extrinsic_optic_to_user.trans_x, + tof_info_v3.extrinsic_optic_to_user.trans_y, + tof_info_v3.extrinsic_optic_to_user.trans_z, + tof_info_v3.extrinsic_optic_to_user.rot_x, + tof_info_v3.extrinsic_optic_to_user.rot_y, + tof_info_v3.extrinsic_optic_to_user.rot_z}; EXPECT_TRUE(ifm3d::compare_array(extrinc_opt_to_user, ifm3d::tof_info::extrincsic_optic_to_user)); @@ -110,12 +110,12 @@ TEST(DeserializeTestWithFile, struct_tof_info_v4) ifm3d::tof_info::amp_normalization_factors)); std::array extrinc_opt_to_user = { - tof_info_v4.extrisic_optic_to_user.trans_x, - tof_info_v4.extrisic_optic_to_user.trans_y, - tof_info_v4.extrisic_optic_to_user.trans_z, - tof_info_v4.extrisic_optic_to_user.rot_x, - tof_info_v4.extrisic_optic_to_user.rot_y, - tof_info_v4.extrisic_optic_to_user.rot_z}; + tof_info_v4.extrinsic_optic_to_user.trans_x, + tof_info_v4.extrinsic_optic_to_user.trans_y, + tof_info_v4.extrinsic_optic_to_user.trans_z, + tof_info_v4.extrinsic_optic_to_user.rot_x, + tof_info_v4.extrinsic_optic_to_user.rot_y, + tof_info_v4.extrinsic_optic_to_user.rot_z}; EXPECT_TRUE(ifm3d::compare_array(extrinc_opt_to_user, ifm3d::tof_info::extrincsic_optic_to_user)); @@ -179,12 +179,12 @@ TEST(DeserializeTestWithFile, struct_rgb_info_v1) ifm3d::epsilon); std::array extrinc_opt_to_user = { - rgb_info_v1.extrisic_optic_to_user.trans_x, - rgb_info_v1.extrisic_optic_to_user.trans_y, - rgb_info_v1.extrisic_optic_to_user.trans_z, - rgb_info_v1.extrisic_optic_to_user.rot_x, - rgb_info_v1.extrisic_optic_to_user.rot_y, - rgb_info_v1.extrisic_optic_to_user.rot_z}; + rgb_info_v1.extrinsic_optic_to_user.trans_x, + rgb_info_v1.extrinsic_optic_to_user.trans_y, + rgb_info_v1.extrinsic_optic_to_user.trans_z, + rgb_info_v1.extrinsic_optic_to_user.rot_x, + rgb_info_v1.extrinsic_optic_to_user.rot_y, + rgb_info_v1.extrinsic_optic_to_user.rot_z}; EXPECT_TRUE(ifm3d::compare_array(extrinc_opt_to_user, ifm3d::rgb_info::extrincsic_optic_to_user)); diff --git a/modules/pybind11/src/bindings/deserialize/rgb_info_v1.h b/modules/pybind11/src/bindings/deserialize/rgb_info_v1.h index 8ca12936..e5a84577 100644 --- a/modules/pybind11/src/bindings/deserialize/rgb_info_v1.h +++ b/modules/pybind11/src/bindings/deserialize/rgb_info_v1.h @@ -55,8 +55,8 @@ bind_struct_rgbinfov1(pybind11::module_& m) Actual exposure time of the 2D image )"); rgb_info_v1.def_readonly( - "extrisic_optic_to_user", - &ifm3d::RGBInfoV1::extrisic_optic_to_user, + "extrinsic_optic_to_user", + &ifm3d::RGBInfoV1::extrinsic_optic_to_user, R"( Extrinsic optic paramter of the 2D head )"); diff --git a/modules/pybind11/src/bindings/deserialize/tof_info_v3.h b/modules/pybind11/src/bindings/deserialize/tof_info_v3.h index a8022e30..1723db38 100644 --- a/modules/pybind11/src/bindings/deserialize/tof_info_v3.h +++ b/modules/pybind11/src/bindings/deserialize/tof_info_v3.h @@ -128,8 +128,8 @@ bind_struct_tofinfov3(pybind11::module_& m) Amplitude normalization factors for the individual exposure times )"); tof_info_v3.def_readonly( - "extrisic_optic_to_user", - &ifm3d::TOFInfoV3::extrisic_optic_to_user, + "extrinsic_optic_to_user", + &ifm3d::TOFInfoV3::extrinsic_optic_to_user, R"( Extrinsic optic parameter to user )");