diff options
author | Andrew Dolgov <[email protected]> | 2013-05-18 22:18:53 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-05-18 22:19:24 +0400 |
commit | dce5037888968788518dfdb6b1c29f3863238b92 (patch) | |
tree | bf367c54cdf46ba778fddd22a2c8f4c7cea43ddb /include | |
parent | 47673e66115695c5a73d8e04972ee9062fab3e64 (diff) |
remove floicon because its author is a colossal shitlord (http://tt-rss.org/forum/viewtopic.php?f=1&t=2055&p=10824#p10822)
Diffstat (limited to 'include')
-rw-r--r-- | include/colors.php | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/colors.php b/include/colors.php index 41bf7b819..477a7bd86 100644 --- a/include/colors.php +++ b/include/colors.php @@ -1,7 +1,5 @@ <?php -require_once "lib/floIcon.php"; - function _resolve_htmlcolor($color) { $htmlcolors = array ("aliceblue" => "#f0f8ff", "antiquewhite" => "#faebd7", @@ -285,19 +283,7 @@ function hsl2rgb($arr) { $colors = array(); $size = @getimagesize($imageFile); - - if (!defined('_DISABLE_FLOICON') && 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)); - } + $img = @imagecreatefromstring(file_get_contents($imageFile)); if (!$img) return false; |