james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More comments and fix undefined variables.

Browse Source
This commit is contained in:
jgen 2014-04-01 22:02:36 -04:00
parent 9b1c3db400
commit 1e49cc9122
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/resize/main.php
View File

@ -230,10 +230,10 @@ class ResizeImage extends Extension {
case IMAGETYPE_JPEG: $image = imagecreatefromjpeg($image_filename); break; case IMAGETYPE_JPEG: $image = imagecreatefromjpeg($image_filename); break;
case IMAGETYPE_PNG: $image = imagecreatefrompng($image_filename); break; case IMAGETYPE_PNG: $image = imagecreatefrompng($image_filename); break;
default: default:
throw new ImageResizeException("Unsupported image type."); throw new ImageResizeException("Unsupported image type (Only GIF, JPEG, and PNG are supported).");
} }
/* Resize and resample the image */ // Handle transparent images
$image_resized = imagecreatetruecolor( $new_width, $new_height ); $image_resized = imagecreatetruecolor( $new_width, $new_height );
@ -246,7 +246,7 @@ class ResizeImage extends Extension {
$transparent_color = imagecolorsforindex($image, $transparency); $transparent_color = imagecolorsforindex($image, $transparency);
// Allocate the same color in the new image resource // Allocate the same color in the new image resource
$transparency = imagecolorallocate($image_resized, $trnprt_color['red'], $trnprt_color['green'], $trnprt_color['blue']); $transparency = imagecolorallocate($image_resized, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
// Completely fill the background of the new image with allocated color. // Completely fill the background of the new image with allocated color.
imagefill($image_resized, 0, 0, $transparency); imagefill($image_resized, 0, 0, $transparency);
@ -261,10 +261,10 @@ class ResizeImage extends Extension {
imagealphablending($image_resized, false); imagealphablending($image_resized, false);
imagesavealpha($image_resized, true); imagesavealpha($image_resized, true);
$transparent_color = imagecolorallocatealpha($image_resized, 255, 255, 255, 127); $transparent_color = imagecolorallocatealpha($image_resized, 255, 255, 255, 127);
imagefilledrectangle($image_resized, 0, 0, $width, $height, $transparent_color); imagefilledrectangle($image_resized, 0, 0, $new_width, $new_height, $transparent_color);
} }
// Resize the image. // Actually resize the image.
imagecopyresampled($image_resized, $image, 0, 0, 0, 0, $new_width, $new_height, $image_obj->width, $image_obj->height); imagecopyresampled($image_resized, $image, 0, 0, 0, 0, $new_width, $new_height, $image_obj->width, $image_obj->height);
/* Temp storage while we resize */ /* Temp storage while we resize */
@ -273,6 +273,15 @@ class ResizeImage extends Extension {
throw new ImageResizeException("Unable to save temporary image file."); throw new ImageResizeException("Unable to save temporary image file.");
} }
/* Output to the same format as the original image */
switch ( $info[2] ) {
case IMAGETYPE_GIF: imagegif($image_resized, $tmp_filename); break;
case IMAGETYPE_JPEG: imagejpeg($image_resized, $tmp_filename); break;
case IMAGETYPE_PNG: imagepng($image_resized, $tmp_filename); break;
default:
throw new ImageResizeException("Failed to save the new image - Unsupported image type.");
}
/* Move the new image into the main storage location */ /* Move the new image into the main storage location */
$new_hash = md5_file($tmp_filename); $new_hash = md5_file($tmp_filename);
$new_size = filesize($tmp_filename); $new_size = filesize($tmp_filename);