Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[hardware][interfaces][graphics] fix -Wimplicit-int-float-conversion"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-05 22:50:29 +00:00
committed by Android (Google) Code Review
parent 7ac81273de de2a5dcd48
commit 622c04a620
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp
View File

@@ -1389,7 +1389,7 @@ static std::string rectString(hwc_rect_t rect) {
}
static std::string approximateFloatString(float f) {
if (static_cast<int32_t>(f) == f) {
if (static_cast<float>(static_cast<int32_t>(f)) == f) {
return std::to_string(static_cast<int32_t>(f));
}
int32_t truncated = static_cast<int32_t>(f * 10);
@@ -1680,10 +1680,10 @@ std::string HWC2On1Adapter::Display::Config::toString(bool splitLine) const {
if (mAttributes.count(HWC2::Attribute::DpiX) != 0 &&
mAttributes.at(HWC2::Attribute::DpiX) != -1) {
std::memset(buffer, 0, BUFFER_SIZE);
writtenBytes = snprintf(buffer, BUFFER_SIZE,
", DPI: %.1f x %.1f",
mAttributes.at(HWC2::Attribute::DpiX) / 1000.0f,
mAttributes.at(HWC2::Attribute::DpiY) / 1000.0f);
writtenBytes =
snprintf(buffer, BUFFER_SIZE, ", DPI: %.1f x %.1f",
static_cast<float>(mAttributes.at(HWC2::Attribute::DpiX)) / 1000.0f,
static_cast<float>(mAttributes.at(HWC2::Attribute::DpiY)) / 1000.0f);
output.append(buffer, writtenBytes);
}