Merge remote-tracking branch 'origin/main'

codemasher · codemasher · commit f65d9d2815b4 · 2024-07-17T10:20:05.000+02:00
diff --git a/src/Output/QRGdImage.php b/src/Output/QRGdImage.php
@@ -163,6 +163,8 @@ public function dump(string|null $file = null):string|GdImage{
 			// scale down to the expected size
 			$this->image    = imagescale($this->image, ($this->length / 10), ($this->length / 10));
 			$this->upscaled = false;
+			// Reset scaled and length values after rescaling image to prevent issues with subclasses that use the output from dump()
+			$this->setMatrixDimensions();
 		}
 
 		// set transparency after scaling, otherwise it would be undone

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,8 @@ public function dump(string\|null $file = null):string\|GdImage{`
`163`	`163`	`// scale down to the expected size`
`164`	`164`	`$this->image = imagescale($this->image, ($this->length / 10), ($this->length / 10));`
`165`	`165`	`$this->upscaled = false;`
	`166`	`+ // Reset scaled and length values after rescaling image to prevent issues with subclasses that use the output from dump()`
	`167`	`+ $this->setMatrixDimensions();`
`166`	`168`	`}`
`167`	`169`
`168`	`170`	`// set transparency after scaling, otherwise it would be undone`