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

:octocat: QRGdImage: create image resource during dump() to allow consecutive calls on the same instance

Browse Source
This commit is contained in:
smiley
2023-09-17 23:17:44 +02:00
parent ef1af6296c
commit 3f1020a7ff
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Output/QRGdImage.php
+29 -25
View File
@@ -61,11 +61,12 @@ class QRGdImage extends QROutputAbstract{
$this->matrix = $matrix;
$this->checkGD();
$this->setMatrixDimensions();
$this->image = $this->createImage();
// set module values after image creation because we need the GdImage instance
$this->setModuleValues();
if($this->options->invertMatrix){
$this->matrix->invert();
}
$this->setMatrixDimensions();
}
/**
@@ -103,27 +104,6 @@ class QRGdImage extends QROutputAbstract{
}
/**
* Creates a new GdImage resource and scales it if necessary
*
* we're scaling the image up in order to draw crisp round circles, otherwise they appear square-y on small scales
*
* @see https://github.com/chillerlan/php-qrcode/issues/23
*
* @return \GdImage|resource
*/
protected function createImage(){
if($this->options->drawCircularModules && $this->options->scale < 20){
// increase the initial image size by 10
$this->length = (($this->length + 2) * 10);
$this->scale *= 10;
$this->upscaled = true;
}
return imagecreatetruecolor($this->length, $this->length);
}
/**
* @inheritDoc
*/
@@ -198,6 +178,9 @@ class QRGdImage extends QROutputAbstract{
throw new ErrorException($errstr, $errno);
});
$this->image = $this->createImage();
// set module values after image creation because we need the GdImage instance
$this->setModuleValues();
$this->setBgColor();
imagefilledrectangle($this->image, 0, 0, $this->length, $this->length, $this->background);
@@ -233,6 +216,27 @@ class QRGdImage extends QROutputAbstract{
return $imageData;
}
/**
* Creates a new GdImage resource and scales it if necessary
*
* we're scaling the image up in order to draw crisp round circles, otherwise they appear square-y on small scales
*
* @see https://github.com/chillerlan/php-qrcode/issues/23
*
* @return \GdImage|resource
*/
protected function createImage(){
if($this->options->drawCircularModules && $this->options->scale < 20){
// increase the initial image size by 10
$this->length *= 10;
$this->scale *= 10;
$this->upscaled = true;
}
return imagecreatetruecolor($this->length, $this->length);
}
/**
* Sets the background color
*/