feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

Fix 8bit math (#360)

Browse Source
This commit is contained in:
Michael Miller
2020-07-27 11:38:47 -07:00
committed by GitHub
parent ad38b97f8b
commit 0f45e8d481
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal/RgbColor.h
View File

@@ -178,18 +178,21 @@ struct RgbColor
private: private:
inline static uint8_t _elementDim(uint8_t value, uint8_t ratio) inline static uint8_t _elementDim(uint8_t value, uint8_t ratio)
{ {
return (value * (ratio + 1)) >> 8; return (static_cast<uint16_t>(value) * (static_cast<uint16_t>(ratio) + 1)) >> 8;
} }
inline static uint8_t _elementBrighten(uint8_t value, uint8_t ratio) inline static uint8_t _elementBrighten(uint8_t value, uint8_t ratio)
{ {
uint16_t element = (value << 8) / (ratio + 1); uint16_t element = ((static_cast<uint16_t>(value) + 1) << 8) / (static_cast<uint16_t>(ratio) + 1);
if (element > 255) if (element > 255)
{ {
element = 255; element = 255;
} }
else
{
element -= 1;
}
return element; return element;
} }
}; };

9
src/internal/RgbwColor.h
View File

@@ -208,18 +208,21 @@ struct RgbwColor
private: private:
inline static uint8_t _elementDim(uint8_t value, uint8_t ratio) inline static uint8_t _elementDim(uint8_t value, uint8_t ratio)
{ {
return (value * (ratio + 1)) >> 8; return (static_cast<uint16_t>(value) * (static_cast<uint16_t>(ratio) + 1)) >> 8;
} }
inline static uint8_t _elementBrighten(uint8_t value, uint8_t ratio) inline static uint8_t _elementBrighten(uint8_t value, uint8_t ratio)
{ {
uint16_t element = (value << 8) / (ratio + 1); uint16_t element = ((static_cast<uint16_t>(value) + 1) << 8) / (static_cast<uint16_t>(ratio) + 1);
if (element > 255) if (element > 255)
{ {
element = 255; element = 255;
} }
else
{
element -= 1;
}
return element; return element;
} }
}; };