tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(types): protected calib model member

Browse Source
This commit is contained in:
John Zhao
2019-01-05 23:16:14 +08:00
parent c580f6e8dc
commit 05c5c1f238
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mynteye/device/channel/bytes.cc
View File

@@ -32,7 +32,7 @@ std::string _from_data(const std::uint8_t *data, std::size_t count) {
std::size_t from_data(IntrinsicsBase *in, const std::uint8_t *data,
bool get_size) {
switch (in->calib_model) {
switch (in->calib_model()) {
case CalibrationModel::PINHOLE:
return from_data(dynamic_cast<IntrinsicsPinhole *>(in), data,
get_size);
@@ -40,7 +40,7 @@ std::size_t from_data(IntrinsicsBase *in, const std::uint8_t *data,
return from_data(dynamic_cast<IntrinsicsEquidistant *>(in), data,
get_size);
default:
LOG(FATAL) << "Unknown calib model: " << in->calib_model;
LOG(FATAL) << "Unknown calib model: " << in->calib_model();
}
}
@@ -163,7 +163,7 @@ std::size_t _to_data(std::string value, std::uint8_t *data, std::size_t count) {
std::size_t to_data(const IntrinsicsBase *in, std::uint8_t *data,
bool set_size) {
switch (in->calib_model) {
switch (in->calib_model()) {
case CalibrationModel::PINHOLE:
return to_data(dynamic_cast<const IntrinsicsPinhole *>(in), data,
set_size);
@@ -171,7 +171,7 @@ std::size_t to_data(const IntrinsicsBase *in, std::uint8_t *data,
return to_data(dynamic_cast<const IntrinsicsEquidistant *>(in), data,
set_size);
default:
LOG(FATAL) << "Unknown calib model: " << in->calib_model;
LOG(FATAL) << "Unknown calib model: " << in->calib_model();
}
}

4
src/mynteye/device/channel/file_channel.cc
View File

@@ -334,10 +334,8 @@ std::size_t ImgParamsParser::GetFromData_new(
i += bytes::from_data(in_left.get(), data + i, false);
i += bytes::from_data(in_right.get(), data + i, false);
i += bytes::from_data(&ex_right_to_left, data + i);
in_left->calib_model = calib_model;
in_left->width = width;
in_left->height = height;
in_right->calib_model = calib_model;
in_right->width = width;
in_right->height = height;
(*img_params)[{width, height}] = {true, version.to_string(),
@@ -369,7 +367,7 @@ std::size_t ImgParamsParser::SetToData_new(
for (auto &&entry : *img_params) {
auto &&params = entry.second;
// calib_model, 1
data[i] = static_cast<std::uint8_t>(params.in_left->calib_model);
data[i] = static_cast<std::uint8_t>(params.in_left->calib_model());
i += 1;
// width, 2
bytes::_to_data(params.in_left->width, data + i);