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

Split the existing PDFFunction in two classes, a private PDFFunction and a public PDFFunctionFactory, and utilize the latter in PDFDocument to allow various code to access the methods of PDFFunction`

Browse source 
*Follow-up to PR 8909.*

This requires us to pass around `pdfFunctionFactory` to quite a lot of existing code, however I don't see another way of handling this while still guaranteeing that we can access `PDFFunction` as freely as in the old code.

Please note that the patch passes all tests locally (unit, font, reference), and I *very* much hope that we have sufficient test-coverage for the code in question to catch any typos/mistakes in the re-factoring.
This commit is contained in:
Jonas Jenwald 2017-09-19 13:49:30 +02:00
parent 5c961c76bb
commit b8ec518a1e
8 changed files with 226 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/image.js
View file

@ -75,7 +75,7 @@ var PDFImage = (function PDFImageClosure() {
}
function PDFImage({ xref, res, image, smask = null, mask = null,
isMask = false, }) {
isMask = false, pdfFunctionFactory, }) {
this.image = image;
var dict = image.dict;
if (dict.has('Filter')) {
@ -138,7 +138,8 @@ var PDFImage = (function PDFImageClosure() {
'color components not supported.');
}
}
this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
this.colorSpace = ColorSpace.parse(colorSpace, xref, res,
pdfFunctionFactory);
this.numComps = this.colorSpace.numComps;
}
@ -165,6 +166,7 @@ var PDFImage = (function PDFImageClosure() {
xref,
res,
image: smask,
pdfFunctionFactory,
});
} else if (mask) {
if (isStream(mask)) {
@ -177,6 +179,7 @@ var PDFImage = (function PDFImageClosure() {
res,
image: mask,
isMask: true,
pdfFunctionFactory,
});
}
} else {
@ -190,7 +193,8 @@ var PDFImage = (function PDFImageClosure() {
* with a PDFImage when the image is ready to be used.
*/
PDFImage.buildImage = function({ handler, xref, res, image,
nativeDecoder = null, }) {
nativeDecoder = null,
pdfFunctionFactory, }) {
var imagePromise = handleImageData(image, nativeDecoder);
var smaskPromise;
var maskPromise;
@ -224,13 +228,13 @@ var PDFImage = (function PDFImageClosure() {
image: imageData,
smask: smaskData,
mask: maskData,
pdfFunctionFactory,
});
});
};
PDFImage.createMask = function({ imgArray, width, height,
imageIsFromDecodeStream, inverseDecode, }) {
// |imgArray| might not contain full data for every pixel of the mask, so
// we need to distinguish between |computedLength| and |actualLength|.
// In particular, if inverseDecode is true, then the array we return must