tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

FIX ImageMagick cropped resize

Browse Source
This commit is contained in:
a2nt 2013-05-07 22:07:58 +07:00
parent 8a70019e78
commit 197516b94f
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
filesystem/ImagickBackend.php
View File

@ -236,42 +236,26 @@ class ImagickBackend extends Imagick implements Image_Backend {
$width = round($width); $width = round($width);
$height = round($height); $height = round($height);
$geometry = $this->getImageGeometry(); $geo = $this->getImageGeometry();
// Check that a resize is actually necessary. // Check that a resize is actually necessary.
if ($width == $geometry["width"] && $height == $geometry["height"]) { if ($width == $geo["width"] && $height == $geo["height"]) {
return $this; return $this;
} }
if(!$backgroundColor){
$backgroundColor = new ImagickPixel('transparent');
}
$new = clone $this; $new = clone $this;
$new->setBackgroundColor($backgroundColor); $new->setBackgroundColor($backgroundColor);
$destAR = $width / $height; if(($geo['width']/$width) < ($geo['height']/$height)){
if ($geometry["width"] > 0 && $geometry["height"] > 0) { $new->cropImage($geo['width'], floor($height*$geo['width']/$width), 0, (($geo['height']-($height*$geo['width']/$width))/2));
// We can't divide by zero theres something wrong. }else{
$new->cropImage(ceil($width*$geo['height']/$height), $geo['height'], (($geo['width']-($width*$geo['height']/$height))/2), 0);
$srcAR = $this->width / $this->height;
// Destination narrower than the source
if($destAR < $srcAR) {
$srcY = 0;
$srcHeight = $this->height;
$srcWidth = round( $this->height * $destAR );
$srcX = round( ($this->width - $srcWidth) / 2 );
// Destination shorter than the source
} else {
$srcX = 0;
$srcWidth = $this->width;
$srcHeight = round( $this->width / $destAR );
$srcY = round( ($this->height - $srcHeight) / 2 );
} }
$new->ThumbnailImage($width,$height,true);
$new->extentImage($width, $height, $destX, $destY);
}
return $new; return $new;
} }
} }