GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

slight cleanup, we now get the image type from getimagesize(), rather than finding it ourselves.

This commit is contained in:
Ian Denhardt 2010-08-04 12:03:34 -04:00
parent 78d9edd431
commit 33bce7227f
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/GNUsocialPhotos/actions/photos.php
View File

@ -113,20 +113,23 @@ class PhotosAction extends Action
$height_dest = 192; $height_dest = 192;
$width_dest = 256; $width_dest = 256;
if (substr($filename, -4) == '.jpg' || substr($filename, -5) == '.jpeg') { $size_src = getimagesize(INSTALLDIR . '/file/' . $filename);
$image_type = $size_src[2];
switch($image_type) {
case IMAGETYPE_JPEG:
$image_src = imagecreatefromjpeg(INSTALLDIR . '/file/' . $filename); $image_src = imagecreatefromjpeg(INSTALLDIR . '/file/' . $filename);
$image_type = IMAGETYPE_JPEG; break;
} else if(substr($filename, -4) == '.png') { case IMAGETYPE_PNG:
$image_src = imagecreatefrompng(INSTALLDIR . '/file/' . $filename); $image_src = imagecreatefrompng(INSTALLDIR . '/file/' . $filename);
$image_type = IMAGETYPE_PNG; break;
} else if(substr($filename, -4) == '.gif') { case IMAGETYPE_GIF:
$image_src = imagecreatefromgif(INSTALLDIR . '/file/' . $filename); $image_src = imagecreatefromgif(INSTALLDIR . '/file/' . $filename);
$image_type = IMAGETYPE_GIF; break;
} else { default:
return false; return false;
} }
$size_src = getimagesize(INSTALLDIR . '/file/' . $filename);
$width_src = $size_src[0]; $width_src = $size_src[0];
$height_src = $size_src[1]; $height_src = $size_src[1];