From 977f32b76d562583dbfaea114f59675514e4f98c Mon Sep 17 00:00:00 2001
From: George MacKerron <george@mackerron.co.uk>
Date: Wed, 25 Jan 2017 12:00:00 +0000
Subject: [PATCH 1/2] Colour options and optimizations for drawCanvas

This patch provides arguments for dark and light colours, and makes dramatic reductions in the number of fillRect calls required to draw the QR code (now the background colour is filled in one call, and any consecutive foreground-colour modules in the same row are coalesced into a single fillRect call too).
---
 javascript/qrcodegen.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/javascript/qrcodegen.js b/javascript/qrcodegen.js
index d579577..493b3d3 100644
--- a/javascript/qrcodegen.js
+++ b/javascript/qrcodegen.js
@@ -186,19 +186,28 @@ var qrcodegen = new function() {
 		/*---- Public instance methods ----*/
 		
 		// Draws this QR Code symbol with the given module scale and number of modules onto the given HTML canvas element.
-		// The canvas will be resized to a width and height of (this.size + border * 2) * scale. The painted image will be purely
-		// black and white with no transparent regions. The scale must be a positive integer, and the border must be a non-negative integer.
-		this.drawCanvas = function(scale, border, canvas) {
+		// The canvas will be resized to a width and height of (this.size + border * 2) * scale. The painted image will be 
+		// coloured according to the colours given for 'dark' and 'light'; if 'dark' is omitted, black is used; if 'light' 
+		// is omitted, the background is transparent. The scale must be a positive integer, and the border must be a 
+		// non-negative integer.
+		this.drawCanvas = function(scale, border, canvas, dark, light) {
 			if (scale <= 0 || border < 0)
 				throw "Value out of range";
 			var width = (size + border * 2) * scale;
 			canvas.width = width;
 			canvas.height = width;
 			var ctx = canvas.getContext("2d");
+			if (light) {
+				ctx.fillStyle = light;
+				ctx.fillRect(0, 0, width, width);
+			}
+			ctx.fillStyle = dark;
 			for (var y = -border; y < size + border; y++) {
-				for (var x = -border; x < size + border; x++) {
-					ctx.fillStyle = this.getModule(x, y) == 1 ? "#000000" : "#FFFFFF";
-					ctx.fillRect((x + border) * scale, (y + border) * scale, scale, scale);
+				for (var x = -border; x < size + border; /* no-op */) {
+					var moduleIsDark = this.getModule(x, y) == 1;
+					for (var w = 1; w < size + border - x; w ++) if (this.getModule(x + w, y) != moduleIsDark) break;
+					x += w;
+					if (moduleIsDark) ctx.fillRect((x + border - w) * scale, (y + border) * scale, scale * w, scale);
 				}
 			}
 		};

From 047ea220f02757519e5a9d17a4b86075e7e9af32 Mon Sep 17 00:00:00 2001
From: George MacKerron <george@mackerron.co.uk>
Date: Fri, 27 Jan 2017 19:39:05 +0000
Subject: [PATCH 2/2] Reduced x and y bounds to stop (not) drawing borders in
 drawCanvas

---
 javascript/qrcodegen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/javascript/qrcodegen.js b/javascript/qrcodegen.js
index 493b3d3..ba33689 100644
--- a/javascript/qrcodegen.js
+++ b/javascript/qrcodegen.js
@@ -202,8 +202,8 @@ var qrcodegen = new function() {
 				ctx.fillRect(0, 0, width, width);
 			}
 			ctx.fillStyle = dark;
-			for (var y = -border; y < size + border; y++) {
-				for (var x = -border; x < size + border; /* no-op */) {
+			for (var y = 0; y < size; y++) {
+				for (var x = 0; x < size; /* no-op */) {
 					var moduleIsDark = this.getModule(x, y) == 1;
 					for (var w = 1; w < size + border - x; w ++) if (this.getModule(x + w, y) != moduleIsDark) break;
 					x += w;