pngcrush.sh

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

diff --git a/include/colors.php b/include/colors.php
index 91eaa2dc2c2dd4a1e69ce4097d94234f02a2b1ba..c441f7cb189187bb140f86518ce16d89925faf5c 100644 (file)
--- a/include/colors.php
+++ b/include/colors.php
@@ -288,17 +288,24 @@ function hsl2rgb($arr) {
 
                $size = @getimagesize($imageFile);
 
-               if (strtolower($size['mime']) == 'image/vnd.microsoft.icon' && class_exists("floIcon")) {
+               // to enable .ico support place floIcon.php into lib/
+               if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
 
-                       $ico = new floIcon();
-                       @$ico->readICO($imageFile);
+                       if (class_exists("floIcon")) {
 
-                       if(count($ico->images)==0)
-                               return null;
-                       else
-                               $img = @$ico->images[count($ico->images)-1]->getImageResource();
+                               $ico = new floIcon();
+                               @$ico->readICO($imageFile);
 
-               } else {
+                               if(count($ico->images)==0)
+                                       return false;
+                               else
+                                       $img = @$ico->images[count($ico->images)-1]->getImageResource();
+
+                       } else {
+                               return false;
+                       }
+
+               } else if ($size[0] > 0 && $size[1] > 0) {
                   $img = @imagecreatefromstring(file_get_contents($imageFile));
                }
 
@@ -341,4 +348,4 @@ function hsl2rgb($arr) {
                }
                return '';
        }
-?>
+