From dce5037888968788518dfdb6b1c29f3863238b92 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 18 May 2013 22:18:53 +0400
Subject: remove floicon because its author is a colossal shitlord
 (http://tt-rss.org/forum/viewtopic.php?f=1&t=2055&p=10824#p10822)

---
 include/colors.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'include')

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;
 
-- 
cgit v1.2.3-54-g00ecf