This commit is contained in:
smiley
2025-10-29 20:41:19 +01:00
parent ad1e39aaf6
commit e5e9009aab
5 changed files with 10 additions and 7 deletions
-1
View File
@@ -73,7 +73,6 @@ class QRImageWithText extends QRGdImagePNG{
// copy over the qrcode
imagecopymerge($this->image, $qrcode, 0, 0, 0, 0, $this->length, $this->length, 100);
imagedestroy($qrcode);
$fontColor = imagecolorallocate($this->image, ...$textColor);
$w = imagefontwidth($textSize);
+1 -1
View File
@@ -59,7 +59,7 @@ class MeltedSVGQRCodeOutput extends QRMarkupSVG{
// collect the modules per $M_TYPE
$module = $this->moduleTransform($x, $y, $M_TYPE, $M_TYPE_LAYER);
if(!empty($module)){
if($module !== null){
$paths[$M_TYPE_LAYER][] = $module;
}
}
+6 -2
View File
@@ -56,7 +56,7 @@ class GroupShapeSVGQRCodeOutput extends QRMarkupSVG{
// collect the modules per $M_TYPE
$module = $this->moduleTransform($x, $y, $M_TYPE, $M_TYPE_LAYER);
if(!empty($module)){
if($module !== null){
$paths[$M_TYPE_LAYER][] = $module;
}
}
@@ -68,7 +68,7 @@ class GroupShapeSVGQRCodeOutput extends QRMarkupSVG{
return $paths;
}
protected function moduleTransform(int $x, int $y, int $M_TYPE, int $M_TYPE_LAYER):string{
protected function moduleTransform(int $x, int $y, int $M_TYPE, int $M_TYPE_LAYER):string|null{
$bits = $this->matrix->checkNeighbours($x, $y, null);
$check = fn(int $all, int $any = 0):bool => ($bits & ($all | (~$any & 0xff))) === $all;
@@ -76,6 +76,10 @@ class GroupShapeSVGQRCodeOutput extends QRMarkupSVG{
? $this->darkModule($check, $this->options->inverseMelt)
: $this->lightModule($check, $this->options->inverseMelt);
if($template === ''){
return null;
}
$r = $this->options->meltRadius;
return sprintf($template, $x, $y, $r, (1 - $r), (1 - 2 * $r));
+1 -1
View File
@@ -65,7 +65,7 @@ class RandomDotsSVGOutput extends QRMarkupSVG{
// collect the modules per $M_TYPE
$module = $this->moduleTransform($x, $y, $M_TYPE, $M_TYPE_LAYER);
if(!empty($module)){
if($module !== null){
$paths[$M_TYPE_LAYER][] = $module;
}
}
+2 -2
View File
@@ -53,7 +53,7 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{
// start SVG output
$svg = $this->header();
if(!empty($this->options->svgDefs)){
if($this->options->svgDefs !== ''){
$svg .= sprintf('<defs>%1$s%2$s</defs>%2$s', $this->options->svgDefs, $this->options->eol);
}
@@ -186,7 +186,7 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{
// collect the modules per $M_TYPE
$module = $this->moduleTransform($x, $y, $M_TYPE, $M_TYPE_LAYER);
if(!empty($module)){
if($module !== null){
$paths[$M_TYPE_LAYER][] = $module;
}
}