tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad

Browse Source
This commit is contained in:
Robbie Averill 2017-04-05 14:24:00 +12:00
parent 793a020ce9
commit 197bc53c49
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
model/Image.php
View File

@ -339,10 +339,11 @@ class Image extends File implements Flushable {
* *
* @param integer $width The width to size to * @param integer $width The width to size to
* @param integer $height The height to size to * @param integer $height The height to size to
* @param string $backgroundColor The background colour to use on padded sides (default white)
* @param integer $transparencyPercent Level of transparency * @param integer $transparencyPercent Level of transparency
* @return Image|null * @return Image|null
*/ */
public function Pad($width, $height, $backgroundColor='FFFFFF', $transparencyPercent = 0) { public function Pad($width, $height, $backgroundColor = 'FFFFFF', $transparencyPercent = 0) {
return $this->isSize($width, $height) && !Config::inst()->get('Image', 'force_resample') return $this->isSize($width, $height) && !Config::inst()->get('Image', 'force_resample')
? $this ? $this
: $this->getFormattedImage('Pad', $width, $height, $backgroundColor, $transparencyPercent); : $this->getFormattedImage('Pad', $width, $height, $backgroundColor, $transparencyPercent);
@ -354,12 +355,16 @@ class Image extends File implements Flushable {
* @param Image_Backend $backend * @param Image_Backend $backend
* @param integer $width The width to size to * @param integer $width The width to size to
* @param integer $height The height to size to * @param integer $height The height to size to
* @param string $backgroundColor The background colour to use on padded sides (default white)
* @param integer $transparencyPercent Level of transparency
* @return Image_Backend * @return Image_Backend
* @deprecated 4.0 Generate methods are no longer applicable * @deprecated 4.0 Generate methods are no longer applicable
*/ */
public function generatePad(Image_Backend $backend, $width, $height, $backgroundColor='FFFFFF') { public function generatePad(Image_Backend $backend, $width, $height, $backgroundColor = 'FFFFFF',
$transparencyPercent = 0
) {
Deprecation::notice('4.0', 'Generate methods are no longer applicable'); Deprecation::notice('4.0', 'Generate methods are no longer applicable');
return $backend->paddedResize($width, $height, $backgroundColor); return $backend->paddedResize($width, $height, $backgroundColor, $transparencyPercent);
} }
/** /**