blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

do no try to pass MS icon files to GD

Browse source
This commit is contained in:
Andrew Dolgov 2013-06-15 13:15:20 +04:00
parent 8d1cfe8020
commit a586afa37d
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/colors.php
View file

@ -288,15 +288,22 @@ function hsl2rgb($arr) {
$size = @getimagesize($imageFile); $size = @getimagesize($imageFile);
if (strtolower($size['mime']) == 'image/vnd.microsoft.icon' && class_exists("floIcon")) { // to enable .ico support place floIcon.php into lib/
if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
$ico = new floIcon(); if (class_exists("floIcon")) {
@$ico->readICO($imageFile);
if(count($ico->images)==0) $ico = new floIcon();
return null; @$ico->readICO($imageFile);
else
$img = @$ico->images[count($ico->images)-1]->getImageResource(); if(count($ico->images)==0)
return false;
else
$img = @$ico->images[count($ico->images)-1]->getImageResource();
} else {
return false;
}
} 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));