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

Merge pull request #129 from Makuna/ProtectFromMinMaxMacros

Browse Source 
removed use of macro
This commit is contained in:
Michael Miller
2016-09-03 11:36:13 -07:00
committed by GitHub
parent 2568f60f4c 532a1f5e4d
commit dba5841f75
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal/DotStarColorFeatures.h
View File

@@ -208,7 +208,7 @@ public:
{ {
uint8_t* p = getPixelAddress(pPixels, indexPixel); uint8_t* p = getPixelAddress(pPixels, indexPixel);
*p++ = 0xE0 | min(color.W, 31); // upper three bits are always 111 *p++ = 0xE0 | (color.W < 31 ? color.W : 31); // upper three bits are always 111
*p++ = color.B; *p++ = color.B;
*p++ = color.G; *p++ = color.G;
*p = color.R; *p = color.R;
@@ -290,7 +290,7 @@ public:
{ {
uint8_t* p = getPixelAddress(pPixels, indexPixel); uint8_t* p = getPixelAddress(pPixels, indexPixel);
*p++ = 0xE0 | min(color.W, 31); // upper three bits are always 111 *p++ = 0xE0 | (color.W < 31 ? color.W : 31); // upper three bits are always 111
*p++ = color.G; *p++ = color.G;
*p++ = color.R; *p++ = color.R;
*p = color.B; *p = color.B;

2
src/internal/HtmlColor.cpp
View File

@@ -52,7 +52,7 @@ size_t HtmlColor::ToNumericalString(char* buf, size_t bufSize) const
color >>= 4; color >>= 4;
} }
buf[min(bufLen, 7)] = 0; buf[(bufLen < 7 ? bufLen : 7)] = 0;
} }
return 7; return 7;
} }