X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fcolors.php;h=c441f7cb189187bb140f86518ce16d89925faf5c;hb=81fc862e370a1dfbd3941206fd00076e3cbf0551;hp=7cf1a6af0a71241e6e66cca2de2d82da09a5621d;hpb=073672ccd50d76800b5c2489cea9105aec8957eb;p=tt-rss.git

diff --git a/include/colors.php b/include/colors.php
index 7cf1a6af..c441f7cb 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once "lib/floIcon.php";
+if (file_exists("lib/floIcon.php")) {
+	require_once "lib/floIcon.php";
+}
 
 function _resolve_htmlcolor($color) {
 	$htmlcolors = array ("aliceblue" => "#f0f8ff",
@@ -237,16 +239,16 @@ function rgb2hsl($arr) {
    } else {
       $s = $del_Max / $var_Max;
 
-      $del_R = ((($max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_G = ((($max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_B = ((($max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
       if      ($var_R == $var_Max) $h = $del_B - $del_G;
       else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
       else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
 
-      if ($H < 0) $h++;
-      if ($H > 1) $h--;
+      if ($h < 0) $h++;
+      if ($h > 1) $h--;
    }
 
    return array($h, $s, $v);
@@ -286,16 +288,24 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-		if (!defined('_DISABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
-			$ico = new floIcon();
-			@$ico->readICO($imageFile);
+		// to enable .ico support place floIcon.php into lib/
+		if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+
+			if (class_exists("floIcon")) {
+
+				$ico = new floIcon();
+				@$ico->readICO($imageFile);
 
-			if(count($ico->images)==0)
-				return null;
-			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 {
+			} else {
+				return false;
+			}
+
+		} else if ($size[0] > 0 && $size[1] > 0) {
 		   $img = @imagecreatefromstring(file_get_contents($imageFile));
 		}
 
@@ -338,4 +348,4 @@ function hsl2rgb($arr) {
 		}
 		return '';
 	}
-?>
+