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

Merge pull request #51 from drzax/fix-gd

Browse Source 
BUGFIX: Ensure image sizes are rounded.
This commit is contained in:
Will Rossiter 2011-09-15 18:26:32 -07:00
commit c35c48b768
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
filesystem/GD.php
View File

@ -81,16 +81,16 @@ class GD extends Object {
$srcY = 0;
$srcHeight = $this->height;
$srcWidth = $this->height * $destAR;
$srcX = ($this->width - $srcWidth) / 2;
$srcWidth = round( $this->height * $destAR );
$srcX = round( ($this->width - $srcWidth) / 2 );
// Destination shorter than the source
} else {
$srcX = 0;
$srcWidth = $this->width;
$srcHeight = $this->width / $destAR;
$srcY = ($this->height - $srcHeight) / 2;
$srcHeight = round( $this->width / $destAR );
$srcY = round( ($this->height - $srcHeight) / 2 );
}
imagecopyresampled($newGD, $this->gd, 0,0, $srcX, $srcY, $width, $height, $srcWidth, $srcHeight);
@ -320,16 +320,16 @@ class GD extends Object {
$destY = 0;
$destHeight = $height;
$destWidth = $height * $srcAR;
$destX = ($width - $destWidth) / 2;
$destWidth = round( $height * $srcAR );
$destX = round( ($width - $destWidth) / 2 );
// Destination shorter than the source
} else {
$destX = 0;
$destWidth = $width;
$destHeight = $width / $srcAR;
$destY = ($height - $destHeight) / 2;
$destHeight = round( $width / $srcAR );
$destY = round( ($height - $destHeight) / 2 );
}
imagecopyresampled($newGD, $this->gd, $destX, $destY, 0, 0, $destWidth, $destHeight, $this->width, $this->height);