Revert "remove floicon because its author is a colossal shitlord (http://tt-rss.org...

[tt-rss.git] / include / colors.php

diff --git a/include/colors.php b/include/colors.php
index a9f633ef4e096c043619f1089e94d6b70f7b09c1..41bf7b819f023ab9f1471165cada6c31def37cd0 100644 (file)
--- a/include/colors.php
+++ b/include/colors.php
@@ -237,16 +237,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,7 +286,7 @@ function hsl2rgb($arr) {
 
                $size = @getimagesize($imageFile);
 
-               if (defined('_ENABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+               if (!defined('_DISABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
                        $ico = new floIcon();
                        @$ico->readICO($imageFile);