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

:octocat: let's see how much of a performance difference that makes

Browse Source
This commit is contained in:
smiley
2026-03-19 00:40:43 +01:00
parent dcf71d6d5b
commit 75bed90964
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Output/QRMarkupSVG.php
+15 -7
View File
@@ -11,7 +11,8 @@ declare(strict_types=1);
namespace chillerlan\QRCode\Output;
use function array_chunk, implode, is_string, preg_match, sprintf, trim;
use chillerlan\QRCode\Data\QRMatrix;
use function array_any, array_chunk, implode, is_string, preg_match, sprintf, trim;
/**
* SVG output
@@ -28,9 +29,13 @@ class QRMarkupSVG extends QRMarkup{
final public const string MIME_TYPE = 'image/svg+xml';
// micro optimization for circle radius and diameter values in long loops
// micro optimization for QROptions values in long loops
protected float $r;
protected float $d;
protected bool $drawLightModules;
protected bool $drawCircularModules;
protected array $keepAsSquare;
/**
* @todo: XSS proof
@@ -68,6 +73,12 @@ class QRMarkupSVG extends QRMarkup{
}
protected function createMarkup(bool $saveToFile):string{
$this->r = $this->options->circleRadius;
$this->d = ($this->r * 2);
$this->drawCircularModules = $this->options->drawCircularModules;
$this->drawLightModules = $this->options->drawLightModules;
$this->keepAsSquare = $this->options->keepAsSquare;
$svg = $this->header();
if($this->options->svgDefs !== ''){
@@ -120,9 +131,6 @@ class QRMarkupSVG extends QRMarkup{
* returns one or more SVG <path> elements
*/
protected function paths():string{
$this->r = $this->options->circleRadius;
$this->d = ($this->r * 2);
$paths = $this->collectModules();
$svg = [];
@@ -174,11 +182,11 @@ class QRMarkupSVG extends QRMarkup{
*/
protected function moduleTransform(int $x, int $y, int $M_TYPE, int $M_TYPE_LAYER):string|null{
if(!$this->options->drawLightModules && !$this->matrix->isDark($M_TYPE)){
if(!$this->drawLightModules && !(($M_TYPE & QRMatrix::IS_DARK) === QRMatrix::IS_DARK)){
return null;
}
if($this->options->drawCircularModules && !$this->matrix->checkTypeIn($x, $y, $this->options->keepAsSquare)){
if($this->drawCircularModules && !array_any($this->keepAsSquare, fn($type) => ($M_TYPE & $type) === $type)){
// string interpolation: ugly and fast
$ix = ($x + 0.5 - $this->r);
$iy = ($y + 0.5);
src/Output/QRMarkupXML.php
+2 -1
View File
@@ -13,6 +13,7 @@ declare(strict_types=1);
namespace chillerlan\QRCode\Output;
use chillerlan\QRCode\Data\QRMatrix;
use DOMDocument;
use DOMElement;
use function sprintf;
@@ -126,7 +127,7 @@ class QRMarkupXML extends QRMarkup{
* Creates a DOM element for a single module
*/
protected function module(int $x, int $y, int $M_TYPE):DOMElement|null{
$isDark = $this->matrix->isDark($M_TYPE);
$isDark = (($M_TYPE & QRMatrix::IS_DARK) === QRMatrix::IS_DARK);
if(!$this->options->drawLightModules && !$isDark){
return null;