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

Merge branch 'master' into mediafoundation

Browse Source
This commit is contained in:
Paulchen Panther
2021-05-19 20:14:11 +02:00
committed by GitHub
parent 5f0ad931ba 0d826570bd
commit 0df3cd60c8
7 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/hyperion/ImageToLedsMap.h
View File

@@ -154,7 +154,7 @@ namespace hyperion
const unsigned _verticalBorder;
/// The absolute indices into the image for each led
std::vector<std::vector<unsigned>> _colorsMap;
std::vector<std::vector<int32_t>> _colorsMap;
///
/// Calculates the 'mean color' of the given list. This is the mean over each color-channel
@@ -166,7 +166,7 @@ namespace hyperion
/// @return The mean of the given list of colors (or black when empty)
///
template <typename Pixel_T>
ColorRgb calcMeanColor(const Image<Pixel_T> & image, const std::vector<unsigned> & colors) const
ColorRgb calcMeanColor(const Image<Pixel_T> & image, const std::vector<int32_t> & colors) const
{
const auto colorVecSize = colors.size();