|
@@ -288,15 +288,22 @@ 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);
|
|
|
+
|
|
|
+ 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));
|