frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some extra checks to be more tolerant for configration faults

Browse Source 
Former-commit-id: 5061311d8116f848f36808f2c77dcff011ceb571
This commit is contained in:
johan
2013-10-16 23:19:40 +02:00
parent d50aec63f7
commit 64b9316a04
5 changed files with 379 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/hyperion/Hyperion.cpp
View File

@@ -71,6 +71,16 @@ LedString Hyperion::createLedString(const Json::Value& ledsConfig)
led.minY_frac = std::max(0.0, std::min(1.0, vscanConfig["minimum"].asDouble()));
led.maxY_frac = std::max(0.0, std::min(1.0, vscanConfig["maximum"].asDouble()));
// Fix if the user swapped min and max
if (led.minX_frac > led.maxX_frac)
{
std::swap(led.minX_frac, led.maxX_frac);
}
if (led.minY_frac > led.maxY_frac)
{
std::swap(led.minY_frac, led.maxY_frac);
}
ledString.leds().push_back(led);
}
return ledString;

5
libsrc/hyperion/ImageToLedsMap.cpp
View File

@@ -85,6 +85,11 @@ void ImageToLedsMap::getMeanLedColor(const RgbImage & image, std::vector<RgbColo
RgbColor ImageToLedsMap::calcMeanColor(const RgbImage & image, const std::vector<unsigned> & colors) const
{
if (colors.size() == 0)
{
return RgbColor::BLACK;
}
// Accumulate the sum of each seperate color channel
uint_fast16_t cummRed = 0;
uint_fast16_t cummGreen = 0;