Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select

Conflicts:
	src/canvas.js
	web/viewer.js
This commit is contained in:
Artur Adib 2011-11-28 10:02:07 -05:00
commit 4cfc552163
28 changed files with 6828 additions and 131 deletions

View file

@ -552,7 +552,7 @@ var PDFDoc = (function pdfDoc() {
switch (type) {
case 'JpegStream':
var IR = data[2];
new JpegImage(id, IR, this.objs);
new JpegImageLoader(id, IR, this.objs);
break;
case 'Font':
var name = data[2];