mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Merge remote-tracking branch 'agal/master'

Browse source 
Conflicts:
	pdf.js
	test.html
This commit is contained in:
sbarman 2011-06-09 14:59:15 -07:00
commit 78493db421
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pdf.js
View file

@ -368,6 +368,7 @@ var FlateStream = (function() {
var bufferLength = this.bufferLength;
var bufferPos = this.bufferPos;
var n = 0;
// entire front of stream needs to be copied over since flate
// looksback when decoding
while (0 < bufferLength)
@ -2141,7 +2142,6 @@ var CanvasGraphics = (function() {
error("unhandled amount of components per pixel: " + numComps);
}
}
>>>>>>> 496a6374c1ac04e
}
tmpCtx.putImageData(imgData, 0, 0);
this.ctx.drawImage(tmpCanvas, 0, 0);