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

Merge pull request 'Fix calculating average color for *.ico' (#100) from yan12125/tt-rss:fix-ico-avg-color into master 

Reviewed-on: https://dev.tt-rss.org/tt-rss/tt-rss/pulls/100
This commit is contained in:
fox 2023-02-13 20:43:04 +03:00
parent 0cd4abe4eb 40afee5d12
commit 7bbe71b818
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/colors.php
View File

@ -355,8 +355,9 @@ function colorPalette(string $imageFile, int $numColors, int $granularity = 5):
} else { } else {
$img = @$ico->images[count($ico->images)-1]->getImageResource(); $img = @$ico->images[count($ico->images)-1]->getImageResource();
} }
} else {
return null;
} }
return null;
} else if ($size[0] > 0 && $size[1] > 0) { } else if ($size[0] > 0 && $size[1] > 0) {
$img = @imagecreatefromstring(file_get_contents($imageFile)); $img = @imagecreatefromstring(file_get_contents($imageFile));
} }