Skip to content
This repository
Browse code

Merge branch 'fix-gray-lines' of https://github.com/ljos/jquery-qrcode

Conflicts:
	src/jquery.qrcode.js
  • Loading branch information...
commit 2b253c58f4f23f7c522c9f24627d4a51412f8588 2 parents 3e8586d + 386c0b4
Jerome Etienne authored March 27, 2012
4  Makefile
@@ -5,7 +5,7 @@ all:
5 5
 server:
6 6
 	python -m SimpleHTTPServer
7 7
 
8  
-build: minify homepage_build
  8
+build: minify
9 9
 
10 10
 minify:
11 11
 	echo 	 			 > /tmp/jquery.qrcode.tmp.js
@@ -25,7 +25,7 @@ homepage_build:
25 25
 #		deploy								#
26 26
 #################################################################################
27 27
 
28  
-deploy:
  28
+deploy: build
29 29
 	# assume there is something to commit
30 30
 	# use "git diff --exit-code HEAD" to know if there is something to commit
31 31
 	# so two lines: one if no commit, one if something to commit 
2  examples/basic.html
@@ -13,7 +13,7 @@
13 13
 <script>
14 14
 	//jQuery('#qrcode').qrcode("this plugin is great");
15 15
 	jQuery('#qrcode').qrcode({
16  
-		render	: "table",
  16
+		//render	: "table",
17 17
 		text	: "http://jetienne.com"
18 18
 	});	
19 19
 </script>
7  jquery.qrcode.min.js
@@ -21,7 +21,8 @@ this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(
21 21
 43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
22 22
 3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
23 23
 55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
24  
-45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var i=d[3*f+0],g=d[3*f+1],h=d[3*f+2],j=0;j<i;j++)e.push(new p(g,h));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
  24
+45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
25 25
 (a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
26  
-correctLevel:2},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++)d.fillStyle=a.isDark(f,i)?"#000000":"#ffffff",d.fillRect(i*b,f*e,b,e)}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();
27  
-c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color","#ffffff");d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",d+"px").css("background-color",a.isDark(e,i)?"#000000":"#ffffff").appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);
  26
+correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
  27
+j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
  28
+d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);
4  src/jquery.qrcode.js
@@ -37,7 +37,9 @@
37 37
 			for( var row = 0; row < qrcode.getModuleCount(); row++ ){
38 38
 				for( var col = 0; col < qrcode.getModuleCount(); col++ ){
39 39
 					ctx.fillStyle = qrcode.isDark(row, col) ? options.foreground : options.background;
40  
-					ctx.fillRect( col*tileW, row*tileH, tileW, tileH );  
  40
+					var w = (Math.ceil((col+1)*tileW) - Math.floor(col*tileW));
  41
+					var h = (Math.ceil((row+1)*tileW) - Math.floor(row*tileW));
  42
+					ctx.fillRect(Math.round(col*tileW),Math.round(row*tileH), w, h);  
41 43
 				}	
42 44
 			}
43 45
 			// return just built canvas

0 notes on commit 2b253c5

Please sign in to comment.
Something went wrong with that request. Please try again.