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

Resizing images actually was broken, how nobody noticed I don't know.

Browse Source
This commit is contained in:
jgen 2014-04-01 19:29:31 -04:00
parent 7a95325a5f
commit a442fbe409
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ext/resize/main.php
View File

@ -223,24 +223,37 @@ class ResizeImage extends Extension {
} }
/* Resize and resample the image */ /* Resize and resample the image */
$image_resized = imagecreatetruecolor( $new_width, $new_height ); $image_resized = imagecreatetruecolor( $new_width, $new_height );
if ( ($info[2] == IMAGETYPE_GIF) || ($info[2] == IMAGETYPE_PNG) ) { if ($info[2] == IMAGETYPE_GIF) {
$transparency = imagecolortransparent($image); $transparency = imagecolortransparent($image);
if ($transparency >= 0) { // If we have a specific transparent color
$transparent_color = imagecolorsforindex($image, $trnprt_indx); if ($transparency >= 0) {
$transparency = imagecolorallocate($image_resized, $trnprt_color['red'], $trnprt_color['green'], $trnprt_color['blue']); // Get the original image's transparent color's RGB values
imagefill($image_resized, 0, 0, $transparency); $transparent_color = imagecolorsforindex($image, $transparency);
imagecolortransparent($image_resized, $transparency);
} // Allocate the same color in the new image resource
elseif ($info[2] == IMAGETYPE_PNG) { $transparency = imagecolorallocate($image_resized, $trnprt_color['red'], $trnprt_color['green'], $trnprt_color['blue']);
// Completely fill the background of the new image with allocated color.
imagefill($image_resized, 0, 0, $transparency);
// Set the background color for new image to transparent
imagecolortransparent($image_resized, $transparency);
}
} elseif ($info[2] == IMAGETYPE_PNG) {
//
// More info here: http://stackoverflow.com/questions/279236/how-do-i-resize-pngs-with-transparency-in-php
//
imagealphablending($image_resized, false); imagealphablending($image_resized, false);
$color = imagecolorallocatealpha($image_resized, 0, 0, 0, 127);
imagefill($image_resized, 0, 0, $color);
imagesavealpha($image_resized, true); imagesavealpha($image_resized, true);
} $transparent_color = imagecolorallocatealpha($new_image, 255, 255, 255, 127);
imagefilledrectangle($new_image, 0, 0, $width, $height, $transparent_color);
} }
// 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 */
@ -249,6 +262,7 @@ class ResizeImage extends Extension {
throw new ImageResizeException("Unable to save temporary image file."); throw new ImageResizeException("Unable to save temporary image file.");
} }
// TODO: Are these checks below necessary? They seem redundant?
/* Output to the same format as the original image */ /* Output to the same format as the original image */
switch ( $info[2] ) { switch ( $info[2] ) {
case IMAGETYPE_GIF: imagegif($image_resized, $tmp_filename); break; case IMAGETYPE_GIF: imagegif($image_resized, $tmp_filename); break;