Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added modernize-use-auto to clang-tidy-checks #5397

Merged
merged 13 commits into from
Sep 9, 2022
Merged

Added modernize-use-auto to clang-tidy-checks #5397

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f62d89e
Enabled modernize-use-auto with MinTypeNameLength 7
gnawme Aug 23, 2022
a46eb24
Fixed clang-tidy and clang-format escapes
gnawme Aug 23, 2022
3de6824
Addressed further issues from CI
gnawme Aug 24, 2022
790d278
Fixed constness of cast
gnawme Aug 24, 2022
73c30a6
Fixed issues flagged by review and CI
gnawme Aug 24, 2022
fd0a506
Fixed constness of casts (again?)
gnawme Aug 25, 2022
9ed1b63
Unconsted reinterpret_cast
gnawme Aug 26, 2022
ccde01d
Fixed copy-paste error
gnawme Aug 26, 2022
dc09085
Ran clang-tidy after rebase
gnawme Aug 26, 2022
9db6178
Fixed merge error
gnawme Aug 26, 2022
e8879ef
Made changes per review
gnawme Sep 5, 2022
c70e353
Fixed typo
gnawme Sep 5, 2022
5cb6f2e
Revised per review
gnawme Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ran clang-tidy after rebase
  • Loading branch information
@gnawme
gnawme committed Sep 4, 2022
commit dc09085727084d5043c19af131f7978f5446bb99
22 changes: 11 additions & 11 deletions io/src/ply_io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ pcl::PLYWriter::writeASCII (const std::string &file_name,
}

unsigned int nr_points = cloud.width * cloud.height;
unsigned int point_size = static_cast<unsigned int> (cloud.data.size () / nr_points);
auto point_size = static_cast<unsigned int> (cloud.data.size () / nr_points);

// Write the header information if available
if (use_camera)
Expand Down Expand Up @@ -1015,7 +1015,7 @@ pcl::PLYWriter::writeContentWithCameraASCII (int nr_points,
}
else
{
const pcl::RGB& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
const auto& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
fs << static_cast<int>(color.r) << " " << static_cast<int>(color.g) << " " << static_cast<int>(color.b) << " " << static_cast<int>(color.a);
}
break;
Expand All @@ -1028,7 +1028,7 @@ pcl::PLYWriter::writeContentWithCameraASCII (int nr_points,
}
else
{
const pcl::RGB& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
const auto& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
fs << static_cast<int>(color.r) << " " << static_cast<int>(color.g) << " " << static_cast<int>(color.b);
}
break;
Expand Down Expand Up @@ -1130,7 +1130,7 @@ pcl::PLYWriter::writeContentWithRangeGridASCII (int nr_points,
}
else
{
const pcl::RGB& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
const auto& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
line << static_cast<int>(color.r) << " " << static_cast<int>(color.g) << " " << static_cast<int>(color.b) << " " << static_cast<int>(color.a);
}
break;
Expand All @@ -1150,7 +1150,7 @@ pcl::PLYWriter::writeContentWithRangeGridASCII (int nr_points,
}
else
{
const pcl::RGB& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
const auto& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + c * sizeof (pcl::RGB));
line << static_cast<int>(color.r) << " " << static_cast<int>(color.g) << " " << static_cast<int>(color.b);
}
break;
Expand Down Expand Up @@ -1332,7 +1332,7 @@ pcl::PLYWriter::writeBinary (const std::string &file_name,
}
else
{
const pcl::RGB& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + (total + c) * sizeof (pcl::RGB));
const auto& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + (total + c) * sizeof (pcl::RGB));
fpout.write (reinterpret_cast<const char*> (&color.r), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.g), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.b), sizeof (unsigned char));
Expand All @@ -1348,7 +1348,7 @@ pcl::PLYWriter::writeBinary (const std::string &file_name,
}
else
{
const pcl::RGB& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + (total + c) * sizeof (pcl::RGB));
const auto& color = cloud.at<pcl::RGB>(i, cloud.fields[d].offset + (total + c) * sizeof (pcl::RGB));
fpout.write (reinterpret_cast<const char*> (&color.r), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.g), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.b), sizeof (unsigned char));
Expand Down Expand Up @@ -1530,13 +1530,13 @@ pcl::io::savePLYFile (const std::string &file_name, const pcl::PolygonMesh &mesh
(mesh.cloud.fields[d].name == "rgb"))

{
const pcl::RGB& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
const auto& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
fs << int (color.r) << " " << int (color.g) << " " << int (color.b) << " ";
}
else if ((mesh.cloud.fields[d].datatype == pcl::PCLPointField::UINT32) &&
(mesh.cloud.fields[d].name == "rgba"))
{
const pcl::RGB& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
const auto& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
fs << int (color.r) << " " << int (color.g) << " " << int (color.b) << " " << int (color.a) << " ";
}
else if ((mesh.cloud.fields[d].datatype == pcl::PCLPointField::FLOAT32) && (
Expand Down Expand Up @@ -1629,15 +1629,15 @@ pcl::io::savePLYFileBinary (const std::string &file_name, const pcl::PolygonMesh
(mesh.cloud.fields[d].name == "rgb"))

{
const pcl::RGB& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
const auto& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
fpout.write (reinterpret_cast<const char*> (&color.r), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.g), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.b), sizeof (unsigned char));
}
else if ((mesh.cloud.fields[d].datatype == pcl::PCLPointField::UINT32) &&
(mesh.cloud.fields[d].name == "rgba"))
{
const pcl::RGB& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
const auto& color = mesh.cloud.at<RGB>(i, mesh.cloud.fields[d].offset);
fpout.write (reinterpret_cast<const char*> (&color.r), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.g), sizeof (unsigned char));
fpout.write (reinterpret_cast<const char*> (&color.b), sizeof (unsigned char));
Expand Down