Merge branch 'mjmasn-fix/master/center_align_qr_code'

neocotic · Nov 11, 2015 · 5700640 · 5700640
2 parents 698307a + 66f6b32
commit 5700640
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/qr.js b/qr.js
@@ -1045,18 +1045,20 @@
       px /= width;
       px  = Math.floor(px);
 
+      var offset = Math.floor((size - (px * width)) / 2);
+
       // Draw the QR code.
       c2d.clearRect(0, 0, size, size);
       c2d.fillStyle = data.background || '#fff';
-      c2d.fillRect(0, 0, px * (width + 8), px * (width + 8));
+      c2d.fillRect(0, 0, size, size);
       c2d.fillStyle = data.foreground || '#000';
 
       var i, j;
 
       for (i = 0; i < width; i++) {
         for (j = 0; j < width; j++) {
           if (frame[j * width + i]) {
-            c2d.fillRect(px * i, px * j, px, px);
+            c2d.fillRect(px * i + offset, px * j + offset, px, px);
           }
         }
       }