rely on PHP rather than using my own function (hmmm...)
git-svn-id: file:///home/shish/svn/shimmie2/trunk@896 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
parent
8a4524378c
commit
fab31bcb53
1 changed files with 12 additions and 6 deletions
|
@ -57,12 +57,18 @@ class FlashFileHandler extends Extension {
|
||||||
$image->tag_array = tag_explode($metadata['tags']);
|
$image->tag_array = tag_explode($metadata['tags']);
|
||||||
$image->source = $metadata['source'];
|
$image->source = $metadata['source'];
|
||||||
|
|
||||||
$rect = $this->swf_get_bounds($filename);
|
// redundant, since getimagesize() works on SWF o_O
|
||||||
if(is_null($rect)) {
|
// $rect = $this->swf_get_bounds($filename);
|
||||||
return $null;
|
// if(is_null($rect)) {
|
||||||
}
|
// return $null;
|
||||||
$image->width = $rect[1];
|
// }
|
||||||
$image->height = $rect[3];
|
// $image->width = $rect[1];
|
||||||
|
// $image->height = $rect[3];
|
||||||
|
|
||||||
|
if(!($info = getimagesize($filename))) return null;
|
||||||
|
|
||||||
|
$image->width = $info[0];
|
||||||
|
$image->height = $info[1];
|
||||||
|
|
||||||
return $image;
|
return $image;
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue