valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address PHPStan warnings in 'include/colors.php'. 

------ ------------------------------------------------------------------
Line   include/colors.php
------ ------------------------------------------------------------------
215    Variable $out might not be defined.
223    Parameter #3 $pad_string of function str_pad expects string, int
        given.
255    Variable $h might not be defined.
317    Variable $img might not be defined.
------ ------------------------------------------------------------------
This commit is contained in:
wn_ 2021-11-01 20:37:53 +00:00
parent 9dac9c5a0d
commit 3cc60a0219
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/colors.php
View File

@ -200,27 +200,31 @@ function _color_hue2rgb($m1, $m2, $h) {
### Convert a hex color into an RGB triplet. ### Convert a hex color into an RGB triplet.
function _color_unpack($hex, $normalize = false) { function _color_unpack($hex, $normalize = false) {
$hex = strpos($hex, '#') !== 0 ? _resolve_htmlcolor($hex) : substr($hex, 1);
if (strpos($hex, '#') !== 0)
$hex = _resolve_htmlcolor($hex);
else
$hex = substr($hex, 1);
if (strlen($hex) == 4) { if (strlen($hex) == 4) {
$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3]; $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
} }
$c = hexdec($hex); $c = hexdec($hex);
$out = [];
for ($i = 16; $i >= 0; $i -= 8) { for ($i = 16; $i >= 0; $i -= 8) {
$out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1); $out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
} return $out; }
return $out;
} }
### Convert an RGB triplet to a hex color. ### Convert an RGB triplet to a hex color.
function _color_pack($rgb, $normalize = false) { function _color_pack($rgb, $normalize = false) {
$out = 0; $out = 0;
foreach ($rgb as $k => $v) { foreach ($rgb as $k => $v) {
$out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8)); $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
}return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT); }
return '#'. str_pad(dechex($out), 6, '0', STR_PAD_LEFT);
} }
function rgb2hsl($arr) { function rgb2hsl($arr) {
@ -248,9 +252,14 @@ function rgb2hsl($arr) {
$del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
$del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
if ($var_R == $var_Max) $h = $del_B - $del_G; if ($var_R == $var_Max) {
else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B; $h = $del_B - $del_G;
else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R; } else if ($var_G == $var_Max) {
$h = (1 / 3 ) + $del_R - $del_B;
} else {
// ($var_B == $var_Max)
$h = (2 / 3 ) + $del_G - $del_R;
}
if ($h < 0) $h++; if ($h < 0) $h++;
if ($h > 1) $h--; if ($h > 1) $h--;
@ -292,6 +301,7 @@ function hsl2rgb($arr) {
$colors = array(); $colors = array();
$size = @getimagesize($imageFile); $size = @getimagesize($imageFile);
$img = null;
// to enable .ico support place floIcon.php into lib/ // to enable .ico support place floIcon.php into lib/
if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') { if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {