From 311df7532a909fa6e28deff1ae97bbd658ba32e7 Mon Sep 17 00:00:00 2001 From: justme1968 Date: Thu, 5 Dec 2013 12:56:02 +0000 Subject: [PATCH] fix for '\(255 x @channels)' expanding to a string instead of an array git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4325 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/Color.pm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fhem/FHEM/Color.pm b/fhem/FHEM/Color.pm index 502a76cdf..fe6db8c7c 100644 --- a/fhem/FHEM/Color.pm +++ b/fhem/FHEM/Color.pm @@ -118,23 +118,22 @@ ChannelsToRgb(@) { sub ChannelsToBrightness(@) { my (@channels) = @_; - + my $max = 0; foreach my $value (@channels) { $max = $value if ($max < $value); } - - return { - bri => 0, - channels => \(255 x @channels), - } unless ($max > 0); - + my @bri = (); - my $norm = 255/$max; - foreach my $value (@channels) { - push @bri,int($value*$norm); + if( $max == 0) { + @bri = (0) x @channels; + } else { + my $norm = 255/$max; + foreach my $value (@channels) { + push @bri,int($value*$norm); + } } - + return { bri => int($max/2.55), channels => \@bri,