mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-26 10:08:06 +02:00
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into links
This commit is contained in:
notmasteryet
commit
18172c1b4d
2 changed files with 187 additions and 34 deletions
169
pdf.js
169
pdf.js
|
|
@ -806,6 +806,11 @@ var JpegStream = (function() {
|
|||
|
||||
// create DOM image
|
||||
var img = new Image();
|
||||
img.onload = (function() {
|
||||
this.loaded = true;
|
||||
if (this.onLoad)
|
||||
this.onLoad();
|
||||
}).bind(this);
|
||||
img.src = 'data:image/jpeg;base64,' + window.btoa(bytesToString(bytes));
|
||||
this.domImage = img;
|
||||
}
|
||||
|
|
@ -822,6 +827,44 @@ var JpegStream = (function() {
|
|||
return constructor;
|
||||
})();
|
||||
|
||||
// Simple object to track the loading images
|
||||
// Initialy for every that is in loading call imageLoading()
|
||||
// and, when images onload is fired, call imageLoaded()
|
||||
// When all images are loaded, the onLoad event is fired.
|
||||
var ImagesLoader = (function() {
|
||||
function constructor() {
|
||||
this.loading = 0;
|
||||
}
|
||||
|
||||
constructor.prototype = {
|
||||
imageLoading: function() {
|
||||
++this.loading;
|
||||
},
|
||||
|
||||
imageLoaded: function() {
|
||||
if (--this.loading == 0 && this.onLoad) {
|
||||
this.onLoad();
|
||||
delete this.onLoad;
|
||||
}
|
||||
},
|
||||
|
||||
bind: function(jpegStream) {
|
||||
if (jpegStream.loaded)
|
||||
return;
|
||||
this.imageLoading();
|
||||
jpegStream.onLoad = this.imageLoaded.bind(this);
|
||||
},
|
||||
|
||||
notifyOnLoad: function(callback) {
|
||||
if (this.loading == 0)
|
||||
callback();
|
||||
this.onLoad = callback;
|
||||
}
|
||||
};
|
||||
|
||||
return constructor;
|
||||
})();
|
||||
|
||||
var DecryptStream = (function() {
|
||||
function constructor(str, decrypt) {
|
||||
this.str = str;
|
||||
|
|
@ -1990,7 +2033,7 @@ var LZWStream = (function() {
|
|||
this.cachedData = 0;
|
||||
this.bitsCached = 0;
|
||||
|
||||
var maxLzwDictionarySize = 4097;
|
||||
var maxLzwDictionarySize = 4096;
|
||||
var lzwState = {
|
||||
earlyChange: earlyChange,
|
||||
codeLength: 9,
|
||||
|
|
@ -2036,6 +2079,9 @@ var LZWStream = (function() {
|
|||
var i, j, q;
|
||||
|
||||
var lzwState = this.lzwState;
|
||||
if (!lzwState)
|
||||
return; // eof was found
|
||||
|
||||
var earlyChange = lzwState.earlyChange;
|
||||
var nextCode = lzwState.nextCode;
|
||||
var dictionaryValues = lzwState.dictionaryValues;
|
||||
|
|
@ -2073,6 +2119,7 @@ var LZWStream = (function() {
|
|||
continue;
|
||||
} else {
|
||||
this.eof = true;
|
||||
delete this.lzwState;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -3123,6 +3170,7 @@ var Page = (function() {
|
|||
create: Date.now(),
|
||||
compile: 0.0,
|
||||
fonts: 0.0,
|
||||
images: 0.0,
|
||||
render: 0.0
|
||||
};
|
||||
this.xref = xref;
|
||||
|
|
@ -3200,25 +3248,33 @@ var Page = (function() {
|
|||
|
||||
var gfx = new CanvasGraphics(canvasCtx);
|
||||
var fonts = [];
|
||||
var images = new ImagesLoader()
|
||||
|
||||
this.compile(gfx, fonts);
|
||||
this.compile(gfx, fonts, images);
|
||||
stats.compile = Date.now();
|
||||
|
||||
var displayContinuation = function() {
|
||||
// Always defer call to display() to work around bug in
|
||||
// Firefox error reporting from XHR callbacks.
|
||||
setTimeout(function() {
|
||||
var exc = null;
|
||||
try {
|
||||
self.display(gfx);
|
||||
stats.render = Date.now();
|
||||
} catch (e) {
|
||||
exc = e.toString();
|
||||
}
|
||||
continuation(exc);
|
||||
});
|
||||
};
|
||||
|
||||
var fontObjs = FontLoader.bind(
|
||||
fonts,
|
||||
function() {
|
||||
stats.fonts = Date.now();
|
||||
// Always defer call to display() to work around bug in
|
||||
// Firefox error reporting from XHR callbacks.
|
||||
setTimeout(function() {
|
||||
var exc = null;
|
||||
try {
|
||||
self.display(gfx);
|
||||
stats.render = Date.now();
|
||||
} catch (e) {
|
||||
exc = e.toString();
|
||||
}
|
||||
continuation(exc);
|
||||
images.notifyOnLoad(function() {
|
||||
stats.images = Date.now();
|
||||
displayContinuation();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -3227,7 +3283,7 @@ var Page = (function() {
|
|||
},
|
||||
|
||||
|
||||
compile: function(gfx, fonts) {
|
||||
compile: function(gfx, fonts, images) {
|
||||
if (this.code) {
|
||||
// content was compiled
|
||||
return;
|
||||
|
|
@ -3239,14 +3295,14 @@ var Page = (function() {
|
|||
if (!IsArray(this.content)) {
|
||||
// content is not an array, shortcut
|
||||
content = xref.fetchIfRef(this.content);
|
||||
this.code = gfx.compile(content, xref, resources, fonts);
|
||||
this.code = gfx.compile(content, xref, resources, fonts, images);
|
||||
return;
|
||||
}
|
||||
// the content is an array, compiling all items
|
||||
var i, n = this.content.length, compiledItems = [];
|
||||
for (i = 0; i < n; ++i) {
|
||||
content = xref.fetchIfRef(this.content[i]);
|
||||
compiledItems.push(gfx.compile(content, xref, resources, fonts));
|
||||
compiledItems.push(gfx.compile(content, xref, resources, fonts, images));
|
||||
}
|
||||
// creating the function that executes all compiled items
|
||||
this.code = function(gfx) {
|
||||
|
|
@ -3836,7 +3892,7 @@ var PartialEvaluator = (function() {
|
|||
};
|
||||
|
||||
constructor.prototype = {
|
||||
eval: function(stream, xref, resources, fonts) {
|
||||
eval: function(stream, xref, resources, fonts, images) {
|
||||
resources = xref.fetchIfRef(resources) || new Dict();
|
||||
var xobjs = xref.fetchIfRef(resources.get('XObject')) || new Dict();
|
||||
var patterns = xref.fetchIfRef(resources.get('Pattern')) || new Dict();
|
||||
|
|
@ -3881,8 +3937,10 @@ var PartialEvaluator = (function() {
|
|||
|
||||
if ('Form' == type.name) {
|
||||
args[0].code = this.eval(xobj, xref, xobj.dict.get('Resources'),
|
||||
fonts);
|
||||
fonts, images);
|
||||
}
|
||||
if (xobj instanceof JpegStream)
|
||||
images.bind(xobj); // monitoring image load
|
||||
}
|
||||
} else if (cmd == 'Tf') { // eagerly collect all fonts
|
||||
var fontRes = resources.get('Font');
|
||||
|
|
@ -4202,7 +4260,11 @@ var CanvasExtraState = (function() {
|
|||
constructor.prototype = {
|
||||
clone: function canvasextra_clone() {
|
||||
return Object.create(this);
|
||||
}
|
||||
},
|
||||
setCurrentPoint: function canvasextra_setCurrentPoint(x, y) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
},
|
||||
};
|
||||
return constructor;
|
||||
})();
|
||||
|
|
@ -4254,9 +4316,9 @@ var CanvasGraphics = (function() {
|
|||
this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
|
||||
},
|
||||
|
||||
compile: function(stream, xref, resources, fonts) {
|
||||
compile: function(stream, xref, resources, fonts, images) {
|
||||
var pe = new PartialEvaluator();
|
||||
return pe.eval(stream, xref, resources, fonts);
|
||||
return pe.eval(stream, xref, resources, fonts, images);
|
||||
},
|
||||
|
||||
execute: function(code, xref, resources) {
|
||||
|
|
@ -4329,18 +4391,24 @@ var CanvasGraphics = (function() {
|
|||
// Path
|
||||
moveTo: function(x, y) {
|
||||
this.ctx.moveTo(x, y);
|
||||
this.current.setCurrentPoint(x, y);
|
||||
},
|
||||
lineTo: function(x, y) {
|
||||
this.ctx.lineTo(x, y);
|
||||
this.current.setCurrentPoint(x, y);
|
||||
},
|
||||
curveTo: function(x1, y1, x2, y2, x3, y3) {
|
||||
this.ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
|
||||
this.current.setCurrentPoint(x3, y3);
|
||||
},
|
||||
curveTo2: function(x2, y2, x3, y3) {
|
||||
TODO("'v' operator: need current point in gfx context");
|
||||
var current = this.current;
|
||||
this.ctx.bezierCurveTo(current.x, current.y, x2, y2, x3, y3);
|
||||
current.setCurrentPoint(x3, y3);
|
||||
},
|
||||
curveTo3: function(x1, y1, x3, y3) {
|
||||
this.curveTo(x1, y1, x3, y3, x3, y3);
|
||||
this.current.setCurrentPoint(x3, y3);
|
||||
},
|
||||
closePath: function() {
|
||||
this.ctx.closePath();
|
||||
|
|
@ -5757,7 +5825,7 @@ var PDFFunction = (function() {
|
|||
if (!typeFn)
|
||||
error('Unknown type of function');
|
||||
|
||||
typeFn.call(this, fn, dict);
|
||||
typeFn.call(this, fn, dict, xref);
|
||||
};
|
||||
|
||||
constructor.prototype = {
|
||||
|
|
@ -5902,9 +5970,58 @@ var PDFFunction = (function() {
|
|||
return out;
|
||||
}
|
||||
},
|
||||
constructStiched: function() {
|
||||
TODO('unhandled type of function');
|
||||
this.func = function() { return [255, 105, 180]; }
|
||||
constructStiched: function(fn, dict, xref) {
|
||||
var domain = dict.get('Domain');
|
||||
var range = dict.get('Range');
|
||||
|
||||
if (!domain)
|
||||
error('No domain');
|
||||
|
||||
var inputSize = domain.length / 2;
|
||||
if (inputSize != 1)
|
||||
error('Bad domain for stiched function');
|
||||
|
||||
var fnRefs = dict.get('Functions');
|
||||
var fns = [];
|
||||
for (var i = 0, ii = fnRefs.length; i < ii; ++i)
|
||||
fns.push(new PDFFunction(xref, xref.fetchIfRef(fnRefs[i])));
|
||||
|
||||
var bounds = dict.get('Bounds');
|
||||
var encode = dict.get('Encode');
|
||||
|
||||
this.func = function(args) {
|
||||
var clip = function(v, min, max) {
|
||||
if (v > max)
|
||||
v = max;
|
||||
else if (v < min)
|
||||
v = min;
|
||||
return v;
|
||||
}
|
||||
|
||||
// clip to domain
|
||||
var v = clip(args[0], domain[0], domain[1]);
|
||||
// calulate which bound the value is in
|
||||
for (var i = 0, ii = bounds.length; i < ii; ++i) {
|
||||
if (v < bounds[i])
|
||||
break;
|
||||
}
|
||||
|
||||
// encode value into domain of function
|
||||
var dmin = domain[0];
|
||||
if (i > 0)
|
||||
dmin = bounds[i - 1];
|
||||
var dmax = domain[1];
|
||||
if (i < bounds.length)
|
||||
dmax = bounds[i];
|
||||
|
||||
var rmin = encode[2 * i];
|
||||
var rmax = encode[2 * i + 1];
|
||||
|
||||
var v2 = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
|
||||
|
||||
// call the appropropriate function
|
||||
return fns[i].func([v2]);
|
||||
}
|
||||
},
|
||||
constructPostScript: function() {
|
||||
TODO('unhandled type of function');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue