drm_hwcomposer: Enable readability-math-missing-parentheses tidy check
... and fix all related warnings.
Change-Id: Ic122235524e567f2be5040ae7742fefb531a9766
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
diff --git a/.ci/Makefile b/.ci/Makefile
index db22656..0dba6cc 100644
--- a/.ci/Makefile
+++ b/.ci/Makefile
@@ -53,7 +53,6 @@
-readability-redundant-member-init \
-cppcoreguidelines-avoid-const-or-ref-data-members \
-cert-err33-c \
- -readability-math-missing-parentheses \
TIDY_CHECKS_NORMAL := \
$(TIDY_CHECKS_FINE) \
diff --git a/drm/ResourceManager.cpp b/drm/ResourceManager.cpp
index 9c68816..c866263 100644
--- a/drm/ResourceManager.cpp
+++ b/drm/ResourceManager.cpp
@@ -124,7 +124,7 @@
struct timespec ts {};
clock_gettime(CLOCK_MONOTONIC, &ts);
constexpr int64_t kNsInSec = 1000000000LL;
- return int64_t(ts.tv_sec) * kNsInSec + int64_t(ts.tv_nsec);
+ return (int64_t(ts.tv_sec) * kNsInSec) + int64_t(ts.tv_nsec);
}
void ResourceManager::UpdateFrontendDisplays() {
diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp
index 64152ab..defbe42 100644
--- a/drm/VSyncWorker.cpp
+++ b/drm/VSyncWorker.cpp
@@ -124,7 +124,7 @@
if (last_timestamp_ < 0)
return current + frame_ns;
- return frame_ns * ((current - last_timestamp_) / frame_ns + 1) +
+ return (frame_ns * ((current - last_timestamp_) / frame_ns + 1)) +
last_timestamp_;
}
diff --git a/hwc2_device/HwcDisplay.cpp b/hwc2_device/HwcDisplay.cpp
index c0fc3c5..ad5d177 100644
--- a/hwc2_device/HwcDisplay.cpp
+++ b/hwc2_device/HwcDisplay.cpp
@@ -86,8 +86,8 @@
for (int i = 0; i < kCtmCols; i++) {
for (int j = 0; j < kCtmRows; j++) {
constexpr int kInCtmRows = 4;
- color_matrix->matrix[i * kCtmRows + j] = To3132FixPt(
- color_transform_matrix[j * kInCtmRows + i]);
+ color_matrix->matrix[(i * kCtmRows) + j] = To3132FixPt(
+ color_transform_matrix[(j * kInCtmRows) + i]);
}
}
return color_matrix;
@@ -188,7 +188,7 @@
std::string HwcDisplay::DumpDelta(HwcDisplay::Stats delta) {
if (delta.total_pixops_ == 0)
return "No stats yet";
- auto ratio = 1.0 - double(delta.gpu_pixops_) / double(delta.total_pixops_);
+ auto ratio = 1.0 - (double(delta.gpu_pixops_) / double(delta.total_pixops_));
std::stringstream ss;
ss << " Total frames count: " << delta.total_frames_ << "\n"
@@ -253,7 +253,7 @@
for (int i = 0; i < kCtmCols; i++) {
for (int j = 0; j < kCtmRows; j++) {
constexpr uint64_t kOne = (1ULL << 32); /* 1.0 in s31.32 format */
- color_matrix_->matrix[i * kCtmRows + j] = (i == j) ? kOne : 0;
+ color_matrix_->matrix[(i * kCtmRows) + j] = (i == j) ? kOne : 0;
}
}