From 4fe9327491ed11661449062e4d476fdc8d8875ab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 23:22:32 +0400
Subject: Revert "remove floIcon: bugs"

This reverts commit 7970c0925505ba1bd3b3dd15a45bebf2e839f5cf.
---
 include/colors.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index 9e4429a78..1359b9e2d 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -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;
 
-- 
cgit v1.2.3