Use ToRectangle()

manuelbl · manuelbl · commit c2e640c4e912 · 2026-05-25T11:26:42.000+02:00
diff --git a/Demo-ASP.NET-Core/QrCodeBitmapExtensions.cs b/Demo-ASP.NET-Core/QrCodeBitmapExtensions.cs
@@ -52,15 +52,9 @@ public static SKBitmap ToBitmap(this QrCode qrCode, int scale, int border, SKCol
                 // draw modules
                 using (SKPaint paint = new SKPaint { Color = foreground })
                 {
-                    for (int y = 0; y < size; y++)
+                    foreach (var rect in qrCode.ToRectangles())
                     {
-                        for (int x = 0; x < size; x++)
-                        {
-                            if (qrCode.GetModule(x, y))
-                            {
-                                canvas.DrawRect((x + border) * scale, (y + border) * scale, scale, scale, paint);
-                            }
-                        }
+                        canvas.DrawRect((rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale, paint);
                     }
                 }
             }
diff --git a/Demo-ImageMagick/Demo-ImageMagick.csproj b/Demo-ImageMagick/Demo-ImageMagick.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.13.0" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.13.1" />
     <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/Demo-ImageMagick/QrCodeImageExtensions.cs b/Demo-ImageMagick/QrCodeImageExtensions.cs
@@ -60,19 +60,13 @@ public static MagickImage ToImage(this QrCode qrCode, int scale, int border, Mag
         var drawables = new Drawables();
         drawables.FillColor(foreground);
 
-        for (var x = 0; x < size; x++)
+        foreach (var rect in qrCode.ToRectangles())
         {
-            var pointerX = (x + border) * scale;
-
-            for (var y = 0; y < size; y++)
-            {
-                if (qrCode.GetModule(x, y))
-                {
-                    var pointerY = (y + border) * scale;
-                    drawables.Rectangle(pointerX, pointerY, pointerX + scale - 1, pointerY + scale - 1);
-                }
-            }
+            var pointerX = (rect.X + border) * scale;
+            var pointerY = (rect.Y + border) * scale;
+            drawables.Rectangle(pointerX, pointerY, pointerX + rect.Width * scale - 1, pointerY + rect.Height * scale - 1);
         }
+
         drawables.Draw(image);
         return image;
     }
diff --git a/Demo-ImageSharp/QrCodeBitmapExtensions.cs b/Demo-ImageSharp/QrCodeBitmapExtensions.cs
@@ -50,15 +50,9 @@ public static Image ToBitmap(this QrCode qrCode, int scale, int border, Color fo
                 img.Fill(background);
 
                 // draw modules
-                for (int y = 0; y < size; y++)
+                foreach (var rect in qrCode.ToRectangles())
                 {
-                    for (int x = 0; x < size; x++)
-                    {
-                        if (qrCode.GetModule(x, y))
-                        {
-                            img.Fill(foreground, new Rectangle((x + border) * scale, (y + border) * scale, scale, scale));
-                        }
-                    }
+                    img.Fill(foreground, new Rectangle((rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale));
                 }
             });
 
diff --git a/Demo-QRCode-Variety/Program.cs b/Demo-QRCode-Variety/Program.cs
@@ -108,7 +108,7 @@ private static void EmojisWithoutEci()
             // Some readers always ignore the ECI designator.
             var qrCode = QrCode.EncodeTextAdvanced("🎲 😇 🤒 🏌 ⏭ 🚍", QrCode.Ecc.Quartile,
                 encoding: Encoding.UTF8, eci: ECI.None);
-            SaveAsSvg(qrCode, "emojis-qr.svg");
+            SaveAsSvg(qrCode, "emojis-no-eci-qr.svg");
         }
 
         private static void BinaryData()
diff --git a/Demo-SkiaSharp/QrCodeBitmapExtensions.cs b/Demo-SkiaSharp/QrCodeBitmapExtensions.cs
@@ -52,15 +52,9 @@ public static SKBitmap ToBitmap(this QrCode qrCode, int scale, int border, SKCol
                 // draw modules
                 using (SKPaint paint = new SKPaint { Color = foreground })
                 {
-                    for (int y = 0; y < size; y++)
+                    foreach (var rect in qrCode.ToRectangles())
                     {
-                        for (int x = 0; x < size; x++)
-                        {
-                            if (qrCode.GetModule(x, y))
-                            {
-                                canvas.DrawRect((x + border) * scale, (y + border) * scale, scale, scale, paint);
-                            }
-                        }
+                        canvas.DrawRect((rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale, paint);
                     }
                 }
             }
diff --git a/Demo-System-Drawing/QrCodeBitmapExtensions.cs b/Demo-System-Drawing/QrCodeBitmapExtensions.cs
@@ -130,15 +130,9 @@ public static void Draw(this QrCode qrCode, Graphics graphics, float scale, floa
             // draw modules
             using (SolidBrush brush = new SolidBrush(foreground))
             {
-                for (int y = 0; y < size; y++)
+                foreach (var rect in qrCode.ToRectangles())
                 {
-                    for (int x = 0; x < size; x++)
-                    {
-                        if (qrCode.GetModule(x, y))
-                        {
-                            graphics.FillRectangle(brush, (x + border) * scale, (y + border) * scale, scale, scale);
-                        }
-                    }
+                    graphics.FillRectangle(brush, (rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale);
                 }
             }
         }
diff --git a/Demo-WinForms/QrCodeBitmapExtensions.cs b/Demo-WinForms/QrCodeBitmapExtensions.cs
@@ -130,15 +130,9 @@ public static void Draw(this QrCode qrCode, Graphics graphics, float scale, floa
             // draw modules
             using (SolidBrush brush = new SolidBrush(foreground))
             {
-                for (int y = 0; y < size; y++)
+                foreach (var rect in qrCode.ToRectangles())
                 {
-                    for (int x = 0; x < size; x++)
-                    {
-                        if (qrCode.GetModule(x, y))
-                        {
-                            graphics.FillRectangle(brush, (x + border) * scale, (y + border) * scale, scale, scale);
-                        }
-                    }
+                    graphics.FillRectangle(brush, (rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale);
                 }
             }
         }
diff --git a/Demo-WinUI/Demo-WinUI/Views/QrCodeDrawing.cs b/Demo-WinUI/Demo-WinUI/Views/QrCodeDrawing.cs
@@ -34,6 +34,9 @@ public static class QrCodeDrawing
     /// <param name="background"></param>
     public static void Draw(QrCode qrCode, CanvasDrawingSession drawingSession, int borderWidth, Color foreground, Color? background)
     {
+        // turn off anti-aliasing to get crisp edges and avoid gray lines between modules
+        drawingSession.Antialiasing = CanvasAntialiasing.Aliased;
+
         int size = qrCode.Size;
 
         // draw the background
@@ -43,16 +46,10 @@ public static void Draw(QrCode qrCode, CanvasDrawingSession drawingSession, int
         }
 
         // draw the modules
-        for (int y = 0; y < size; y++)
+        foreach (var rect in qrCode.ToRectangles())
         {
-            for (int x = 0; x < size; x++)
-            {
-                if (qrCode.GetModule(x, y))
-                {
-                    var rect = new Rect(x + borderWidth, y + borderWidth, 1, 1);
-                    drawingSession.FillRectangle(rect, foreground);
-                }
-            }
+            var r = new Rect(rect.X + borderWidth, rect.Y + borderWidth, rect.Width, rect.Height);
+            drawingSession.FillRectangle(r, foreground);
         }
     }
 
diff --git a/Demo-WindowsPresentationFoundation/QrCodeDrawing.cs b/Demo-WindowsPresentationFoundation/QrCodeDrawing.cs
@@ -77,16 +77,10 @@ public static void Draw(QrCode qrCode, DrawingContext drawingContext, int border
             }
 
             // draw the modules
-            for (int y = 0; y < size; y++)
+            foreach (var r in qrCode.ToRectangles())
             {
-                for (int x = 0; x < size; x++)
-                {
-                    if (qrCode.GetModule(x, y))
-                    {
-                        var rect = new Rect(x + borderWidth, y + borderWidth, 1, 1);
-                        drawingContext.DrawRectangle(foreground, null, rect);
-                    }
-                }
+                var rect = new Rect(r.X + borderWidth, r.Y + borderWidth, r.Width, r.Height);
+                drawingContext.DrawRectangle(foreground, null, rect);
             }
         }
 
diff --git a/QrCodeAnalyzer/QrCodeDrawing.cs b/QrCodeAnalyzer/QrCodeDrawing.cs
@@ -97,16 +97,10 @@ public static void Draw(QrCode qrCode, DrawingContext drawingContext, int border
             }
 
             // draw the modules
-            for (int y = 0; y < size; y++)
+            foreach (var rect in qrCode.ToRectangles())
             {
-                for (int x = 0; x < size; x++)
-                {
-                    if (qrCode.GetModule(x, y))
-                    {
-                        var rect = new Rect(x + borderWidth, y + borderWidth, 1, 1);
-                        drawingContext.DrawRectangle(foreground, null, rect);
-                    }
-                }
+                var r = new Rect(rect.X + borderWidth, rect.Y + borderWidth, rect.Width, rect.Height);
+                drawingContext.DrawRectangle(foreground, null, r);
             }
         }
 
diff --git a/QrCodeGenerator/docfx/api/index.md b/QrCodeGenerator/docfx/api/index.md
@@ -69,14 +69,11 @@ namespace Examples
     {
         static void Main()
         {
-            var qr = QrCode.EncodeTextAdvanced("3141592653589793238462643383",
+            var qrCode = QrCode.EncodeTextAdvanced("3141592653589793238462643383",
                 QrCode.Ecc.High, eci: ECI.Latin9, minVersion: 5, maxVersion: 5);
-            for (int y = 0; y < qr.Size; y++)
+            foreach (var rect in qrCode.ToRectangles())
             {
-                for (int x = 0; x < qr.Size; x++)
-                {
-                    ... paint qr.GetModule(x,y) ...
-                }
+                ... paint rectangle rect.X, rect.Y, rect.Width, rect.Height
             }
         }
     }
diff --git a/QrCodeGenerator/docs/README.md b/QrCodeGenerator/docs/README.md
@@ -87,14 +87,11 @@ namespace Examples
     {
         static void Main()
         {
-            var qr = QrCode.EncodeTextAdvanced("3141592653589793238462643383",
+            var qrCode = QrCode.EncodeTextAdvanced("3141592653589793238462643383",
                 QrCode.Ecc.High, eci: ECI.Latin9, minVersion: 5, maxVersion: 5);
-            for (int y = 0; y < qr.Size; y++)
+            foreach (var rect in qrCode.ToRectangles())
             {
-                for (int x = 0; x < qr.Size; x++)
-                {
-                    ... paint qr.GetModule(x,y) ...
-                }
+                ... paint rectangle rect.X, rect.Y, rect.Width, rect.Height
             }
         }
     }
diff --git a/README.md b/README.md
@@ -87,14 +87,11 @@ namespace Examples
     {
         static void Main()
         {
-            var qr = QrCode.EncodeTextAdvanced("3141592653589793238462643383",
+            var qrCode = QrCode.EncodeTextAdvanced("3141592653589793238462643383",
                 QrCode.Ecc.High, eci: ECI.Latin9, minVersion: 5, maxVersion: 5);
-            for (int y = 0; y < qr.Size; y++)
+            foreach (var rect in qrCode.ToRectangles())
             {
-                for (int x = 0; x < qr.Size; x++)
-                {
-                    ... paint qr.GetModule(x,y) ...
-                }
+                ... paint rectangle rect.X, rect.Y, rect.Width, rect.Height
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,9 @@ public static SKBitmap ToBitmap(this QrCode qrCode, int scale, int border, SKCol`
`52`	`52`	`// draw modules`
`53`	`53`	`using (SKPaint paint = new SKPaint { Color = foreground })`
`54`	`54`	`{`
`55`		`- for (int y = 0; y < size; y++)`
	`55`	`+ foreach (var rect in qrCode.ToRectangles())`
`56`	`56`	`{`
`57`		`- for (int x = 0; x < size; x++)`
`58`		`- {`
`59`		`- if (qrCode.GetModule(x, y))`
`60`		`- {`
`61`		`- canvas.DrawRect((x + border) * scale, (y + border) * scale, scale, scale, paint);`
`62`		`- }`
`63`		`- }`
	`57`	`+ canvas.DrawRect((rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale, paint);`
`64`	`58`	`}`
`65`	`59`	`}`
`66`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private static void EmojisWithoutEci()`
`108`	`108`	`// Some readers always ignore the ECI designator.`
`109`	`109`	`var qrCode = QrCode.EncodeTextAdvanced("🎲 😇 🤒 🏌 ⏭ 🚍", QrCode.Ecc.Quartile,`
`110`	`110`	`encoding: Encoding.UTF8, eci: ECI.None);`
`111`		`- SaveAsSvg(qrCode, "emojis-qr.svg");`
	`111`	`+ SaveAsSvg(qrCode, "emojis-no-eci-qr.svg");`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private static void BinaryData()`
Original file line number	Diff line number	Diff line change
`@@ -130,15 +130,9 @@ public static void Draw(this QrCode qrCode, Graphics graphics, float scale, floa`
`130`	`130`	`// draw modules`
`131`	`131`	`using (SolidBrush brush = new SolidBrush(foreground))`
`132`	`132`	`{`
`133`		`- for (int y = 0; y < size; y++)`
	`133`	`+ foreach (var rect in qrCode.ToRectangles())`
`134`	`134`	`{`
`135`		`- for (int x = 0; x < size; x++)`
`136`		`- {`
`137`		`- if (qrCode.GetModule(x, y))`
`138`		`- {`
`139`		`- graphics.FillRectangle(brush, (x + border) * scale, (y + border) * scale, scale, scale);`
`140`		`- }`
`141`		`- }`
	`135`	`+ graphics.FillRectangle(brush, (rect.X + border) * scale, (rect.Y + border) * scale, rect.Width * scale, rect.Height * scale);`
`142`	`136`	`}`
`143`	`137`	`}`
`144`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ public static class QrCodeDrawing`
`34`	`34`	`/// <param name="background"></param>`
`35`	`35`	`public static void Draw(QrCode qrCode, CanvasDrawingSession drawingSession, int borderWidth, Color foreground, Color? background)`
`36`	`36`	`{`
	`37`	`+ // turn off anti-aliasing to get crisp edges and avoid gray lines between modules`
	`38`	`+ drawingSession.Antialiasing = CanvasAntialiasing.Aliased;`
	`39`	`+`
`37`	`40`	`int size = qrCode.Size;`
`38`	`41`
`39`	`42`	`// draw the background`
`@@ -43,16 +46,10 @@ public static void Draw(QrCode qrCode, CanvasDrawingSession drawingSession, int`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`// draw the modules`
`46`		`- for (int y = 0; y < size; y++)`
	`49`	`+ foreach (var rect in qrCode.ToRectangles())`
`47`	`50`	`{`
`48`		`- for (int x = 0; x < size; x++)`
`49`		`- {`
`50`		`- if (qrCode.GetModule(x, y))`
`51`		`- {`
`52`		`- var rect = new Rect(x + borderWidth, y + borderWidth, 1, 1);`
`53`		`- drawingSession.FillRectangle(rect, foreground);`
`54`		`- }`
`55`		`- }`
	`51`	`+ var r = new Rect(rect.X + borderWidth, rect.Y + borderWidth, rect.Width, rect.Height);`
	`52`	`+ drawingSession.FillRectangle(r, foreground);`
`56`	`53`	`}`
`57`	`54`	`}`
`58`	`55`
Original file line number	Diff line number	Diff line change
`@@ -77,16 +77,10 @@ public static void Draw(QrCode qrCode, DrawingContext drawingContext, int border`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// draw the modules`
`80`		`- for (int y = 0; y < size; y++)`
	`80`	`+ foreach (var r in qrCode.ToRectangles())`
`81`	`81`	`{`
`82`		`- for (int x = 0; x < size; x++)`
`83`		`- {`
`84`		`- if (qrCode.GetModule(x, y))`
`85`		`- {`
`86`		`- var rect = new Rect(x + borderWidth, y + borderWidth, 1, 1);`
`87`		`- drawingContext.DrawRectangle(foreground, null, rect);`
`88`		`- }`
`89`		`- }`
	`82`	`+ var rect = new Rect(r.X + borderWidth, r.Y + borderWidth, r.Width, r.Height);`
	`83`	`+ drawingContext.DrawRectangle(foreground, null, rect);`
`90`	`84`	`}`
`91`	`85`	`}`
`92`	`86`