Bugfix in viewbox calculation in quietzones=false mode

codebude · codebude · commit 0a3c4d346ccc · 2021-05-02T11:33:08.000+02:00
diff --git a/QRCoder/SvgQRCode.cs b/QRCoder/SvgQRCode.cs
@@ -23,13 +23,17 @@ public string GetGraphic(int pixelsPerModule)
         }
         public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute)
         {
-            var viewBox = new Size(pixelsPerModule * this.QrCodeData.ModuleMatrix.Count, pixelsPerModule * this.QrCodeData.ModuleMatrix.Count);
+            var offset = drawQuietZones ? 0 : 4;
+            var edgeSize = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule - (offset * 2 * pixelsPerModule);
+            var viewBox = new Size(edgeSize, edgeSize);
             return this.GetGraphic(viewBox, darkColor, lightColor, drawQuietZones, sizingMode);
         }
 
         public string GetGraphic(int pixelsPerModule, string darkColorHex, string lightColorHex, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute)
         {
-            var viewBox = new Size(pixelsPerModule * this.QrCodeData.ModuleMatrix.Count, pixelsPerModule * this.QrCodeData.ModuleMatrix.Count);
+            var offset = drawQuietZones ? 0 : 4;
+            var edgeSize = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule - (offset * 2 * pixelsPerModule);
+            var viewBox = new Size(edgeSize, edgeSize);
             return this.GetGraphic(viewBox, darkColorHex, lightColorHex, drawQuietZones, sizingMode);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,17 @@ public string GetGraphic(int pixelsPerModule)`
`23`	`23`	`}`
`24`	`24`	`public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute)`
`25`	`25`	`{`
`26`		`- var viewBox = new Size(pixelsPerModule * this.QrCodeData.ModuleMatrix.Count, pixelsPerModule * this.QrCodeData.ModuleMatrix.Count);`
	`26`	`+ var offset = drawQuietZones ? 0 : 4;`
	`27`	`+ var edgeSize = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule - (offset * 2 * pixelsPerModule);`
	`28`	`+ var viewBox = new Size(edgeSize, edgeSize);`
`27`	`29`	`return this.GetGraphic(viewBox, darkColor, lightColor, drawQuietZones, sizingMode);`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`public string GetGraphic(int pixelsPerModule, string darkColorHex, string lightColorHex, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute)`
`31`	`33`	`{`
`32`		`- var viewBox = new Size(pixelsPerModule * this.QrCodeData.ModuleMatrix.Count, pixelsPerModule * this.QrCodeData.ModuleMatrix.Count);`
	`34`	`+ var offset = drawQuietZones ? 0 : 4;`
	`35`	`+ var edgeSize = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule - (offset * 2 * pixelsPerModule);`
	`36`	`+ var viewBox = new Size(edgeSize, edgeSize);`
`33`	`37`	`return this.GetGraphic(viewBox, darkColorHex, lightColorHex, drawQuietZones, sizingMode);`
`34`	`38`	`}`
`35`	`39`