geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-08-20 01:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

:octocat: clamp RGB values

Browse Source
This commit is contained in:
codemasher
2018-11-08 22:08:07 +01:00
parent d72b7ff3ea
commit 854cdbfbba
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Output/QRImage.php
+1 -1
View File
@@ -71,7 +71,7 @@ class QRImage extends QROutputAbstract{
*/
public function dump(string $file = null):string{
$this->image = imagecreatetruecolor($this->length, $this->length);
$this->background = imagecolorallocate($this->image, ...array_values($this->options->imageTransparencyBG));
$this->background = imagecolorallocate($this->image, ...$this->options->imageTransparencyBG);
if((bool)$this->options->imageTransparent && in_array($this->options->outputType, $this::TRANSPARENCY_TYPES, true)){
imagecolortransparent($this->image, $this->background);
src/QROptionsTrait.php
+29 -2
View File
@@ -12,6 +12,8 @@
namespace chillerlan\QRCode;
use chillerlan\QRCode\Output\QRImage;
trait QROptionsTrait{
/**
@@ -240,8 +242,8 @@ trait QROptionsTrait{
throw new QRCodeException('Invalid error correct level: '.$this->eccLevel);
}
if(!is_array($this->imageTransparencyBG) || count($this->imageTransparencyBG) < 3){
$this->imageTransparencyBG = [255, 255, 255];
if(in_array($this->outputType, QRCode::OUTPUT_MODES[QRImage::class], true)){
$this->clampRGBValues();
}
$this->version = max(1, min(40, (int)$this->version));
@@ -258,4 +260,29 @@ trait QROptionsTrait{
}
}
/**
* @throws \chillerlan\QRCode\QRCodeException
*/
protected function clampRGBValues():void{
if(!is_array($this->imageTransparencyBG) || count($this->imageTransparencyBG) < 3){
$this->imageTransparencyBG = [255, 255, 255];
}
else{
foreach($this->imageTransparencyBG as $k => $v){
if(!is_numeric($v)){
throw new QRCodeException('Invalid RGB value.');
}
// clamp the values
$this->imageTransparencyBG[$k] = max(0, min(255, (int)$v));
}
// use the array values to not run into errors with the spread operator (...$arr)
$this->imageTransparencyBG = array_values($this->imageTransparencyBG);
}
}
}