0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "color_t: make macOS happy""

Browse source 
This reverts commit 5a77ff92c6.
This commit is contained in:
Celtic Minstrel 2024-07-23 08:25:02 -04:00
parent ac431ca9dd
commit c89c1b4b4a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/color.cpp
View file

@ -34,10 +34,10 @@ color_t color_t::from_rgba_string(const std::string& c)
}
return {
utils::from_chars<uint8_t>(fields[0]).value(),
utils::from_chars<uint8_t>(fields[1]).value(),
utils::from_chars<uint8_t>(fields[2]).value(),
fields.size() == 4 ? utils::from_chars<uint8_t>(fields[3]).value() : ALPHA_OPAQUE
*utils::from_chars<uint8_t>(fields[0]),
*utils::from_chars<uint8_t>(fields[1]),
*utils::from_chars<uint8_t>(fields[2]),
fields.size() == 4 ? *utils::from_chars<uint8_t>(fields[3]) : ALPHA_OPAQUE
};
}
@ -54,9 +54,9 @@ color_t color_t::from_rgb_string(const std::string& c)
}
return {
utils::from_chars<uint8_t>(fields[0]).value(),
utils::from_chars<uint8_t>(fields[1]).value(),
utils::from_chars<uint8_t>(fields[2]).value(),
*utils::from_chars<uint8_t>(fields[0]),
*utils::from_chars<uint8_t>(fields[1]),
*utils::from_chars<uint8_t>(fields[2]),
ALPHA_OPAQUE
};
}
@ -71,7 +71,7 @@ color_t color_t::from_hex_string(const std::string& c)
throw std::invalid_argument("Color hex string contains invalid characters");
}
auto temp_c = utils::from_chars<uint32_t>(c, 16).value();
auto temp_c = *utils::from_chars<uint32_t>(c, 16);
return {
static_cast<uint8_t>((0x00FFFFFF & temp_c) >> 16),