7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix color parsign

Browse source
This commit is contained in:
HJfod 2024-02-12 17:37:31 +02:00
parent 94ab199406
commit 131539fa00
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
loader/src/utils/cocos.cpp
View file

@ -103,20 +103,20 @@ ccColor4B matjson::Serialize<ccColor4B>::from_json(matjson::Value const& json) {
} }
Result<ccColor3B> geode::cocos::cc3bFromHexString(std::string const& rawHexValue, bool permissive) { Result<ccColor3B> geode::cocos::cc3bFromHexString(std::string const& rawHexValue, bool permissive) {
if (permissive && rawHexValue.empty()) {
return Ok(ccc3(255, 255, 255));
}
auto hexValue = rawHexValue; auto hexValue = rawHexValue;
if (hexValue[0] == '#') { if (hexValue[0] == '#') {
hexValue.erase(hexValue.begin()); hexValue.erase(hexValue.begin());
} }
if (permissive && hexValue.empty()) {
return Ok(ccc3(255, 255, 255));
}
if (hexValue.size() > 6) { if (hexValue.size() > 6) {
return Err("Hex value too large"); return Err("Hex value too large");
} }
int numValue; size_t numValue;
auto res = std::from_chars(hexValue.data(), hexValue.data() + hexValue.size(), numValue, 16); auto res = std::from_chars(hexValue.data(), hexValue.data() + hexValue.size(), numValue, 16);
if (res.ec != std::errc()) { if (res.ec != std::errc()) {
return Err("Invalid hex value"); return Err("Invalid hex value '{}'", hexValue);
} }
switch (hexValue.size()) { switch (hexValue.size()) {
case 6: { case 6: {
@ -161,20 +161,20 @@ Result<ccColor3B> geode::cocos::cc3bFromHexString(std::string const& rawHexValue
} }
Result<ccColor4B> geode::cocos::cc4bFromHexString(std::string const& rawHexValue, bool requireAlpha, bool permissive) { Result<ccColor4B> geode::cocos::cc4bFromHexString(std::string const& rawHexValue, bool requireAlpha, bool permissive) {
if (permissive && rawHexValue.empty()) {
return Ok(ccc4(255, 255, 255, 255));
}
auto hexValue = rawHexValue; auto hexValue = rawHexValue;
if (hexValue[0] == '#') { if (hexValue[0] == '#') {
hexValue.erase(hexValue.begin()); hexValue.erase(hexValue.begin());
} }
if (permissive && hexValue.empty()) {
return Ok(ccc4(255, 255, 255, 255));
}
if (hexValue.size() > 8) { if (hexValue.size() > 8) {
return Err("Hex value too large"); return Err("Hex value too large");
} }
int numValue; size_t numValue;
auto res = std::from_chars(hexValue.data(), hexValue.data() + hexValue.size(), numValue, 16); auto res = std::from_chars(hexValue.data(), hexValue.data() + hexValue.size(), numValue, 16);
if (res.ec != std::errc()) { if (res.ec != std::errc()) {
return Err("Invalid hex value"); return Err("Invalid hex value '{}'", hexValue);
} }
switch (hexValue.size()) { switch (hexValue.size()) {
case 8: { case 8: {