Skip to content

Commit 281dea3

Browse files
authored
fix(autoware_image_diagnostics): fix cppcheck warnings (#8228)
* fix(autoware_image_diagnostics): fix cppcheck warnings Signed-off-by: Ryuta Kambe <ryuta.kambe@tier4.jp> * fix Signed-off-by: Ryuta Kambe <ryuta.kambe@tier4.jp> --------- Signed-off-by: Ryuta Kambe <ryuta.kambe@tier4.jp>
1 parent 4f73499 commit 281dea3

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

Diff for: sensing/autoware_image_diagnostics/src/image_diagnostics_node.cpp

+6-14
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,19 @@ void ImageDiagNode::onImageDiagChecker(DiagnosticStatusWrapper & stat)
5050
stat.add("number backlight regions ", std::to_string(params_.num_of_regions_backlight));
5151

5252
auto level = DiagnosticStatusWrapper::OK;
53+
std::string msg = "OK";
54+
5355
if (params_.diagnostic_status < 0) {
5456
level = DiagnosticStatusWrapper::STALE;
57+
msg = "STALE";
5558
} else if (params_.diagnostic_status == 1) {
5659
level = DiagnosticStatusWrapper::WARN;
60+
msg = "WARNING: abnormal state in image diagnostics";
5761
} else if (params_.diagnostic_status == 2) {
5862
level = DiagnosticStatusWrapper::ERROR;
59-
} else {
60-
level = DiagnosticStatusWrapper::OK;
61-
}
62-
63-
std::string msg;
64-
if (level == DiagnosticStatusWrapper::OK) {
65-
msg = "OK";
66-
} else if (level == DiagnosticStatusWrapper::WARN) {
67-
msg = "WARNING: abnormal state in image diagnostics";
68-
} else if (level == DiagnosticStatusWrapper::ERROR) {
6963
msg = "ERROR: abnormal state in image diagnostics";
70-
} else if (level == DiagnosticStatusWrapper::STALE) {
71-
msg = "STALE";
7264
}
65+
7366
stat.summary(level, msg);
7467
}
7568

@@ -101,7 +94,6 @@ void ImageDiagNode::ImageChecker(const sensor_msgs::msg::Image::ConstSharedPtr i
10194
img_gray.convertTo(img_gray_32b, CV_32FC1);
10295
cv::Mat imgDCT(size, CV_32FC1);
10396
imgDCT.setTo(0.0);
104-
float region_freq_average = 0.0;
10597
cv::Mat imgDFT(size, CV_32FC1);
10698
imgDFT.setTo(0.0);
10799
// calculate the features of each small block in image
@@ -132,7 +124,7 @@ void ImageDiagNode::ImageChecker(const sensor_msgs::msg::Image::ConstSharedPtr i
132124
cv::Mat rect_tmp = img_gray_32b(roi);
133125
channelImg[0](original_roi).copyTo(rect_tmp);
134126
cv::log(rect_tmp, rect_tmp);
135-
region_freq_average = cv::mean(rect_tmp)[0];
127+
const float region_freq_average = cv::mean(rect_tmp)[0];
136128

137129
region_average_vec.push_back(intensity_average);
138130
region_blockage_ratio_vec.push_back(roi_blockage_ratio);

0 commit comments

Comments
 (0)