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

Merge remote-tracking branch 'upstream/master' into style

Browse source 
Conflicts:
	src/image.js
	src/pattern.js
This commit is contained in:
Kalervo Kujala 2011-12-09 00:28:31 +02:00
commit cd01302de8
11 changed files with 78 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core.js
View file

@ -562,8 +562,8 @@ var PDFDoc = (function PDFDocClosure() {
switch (type) {
case 'JpegStream':
var IR = data[2];
new JpegImageLoader(id, IR, this.objs);
var imageData = data[2];
loadJpegStream(id, imageData, this.objs);
break;
case 'Font':
var name = data[2];