public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-25 12:17:10 +00:00
Code Issues Releases Wiki Activity

Revert "remove floIcon: bugs"

Browse Source 
This reverts commit 7970c09255.
This commit is contained in:
Andrew Dolgov
2013-04-16 23:22:32 +04:00
parent 7970c09255
commit 4fe9327491
2 changed files with 857 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/colors.php
View File

@@ -1,5 +1,7 @@
<?php
require_once "lib/floIcon.php";
function _resolve_htmlcolor($color) {
$htmlcolors = array ("aliceblue" => "#f0f8ff",
"antiquewhite" => "#faebd7",
@@ -284,7 +286,18 @@ function hsl2rgb($arr) {
$size = @getimagesize($imageFile);
$img = @imagecreatefromstring(file_get_contents($imageFile));
if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
$ico = new floIcon();
@$ico->readICO($imageFile);
if(count($ico->images)==0)
return null;
else
$img = @$ico->images[count($ico->images)-1]->getImageResource();
} else {
$img = @imagecreatefromstring(file_get_contents($imageFile));
}
if (!$img) return false;