Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9954 from Snuffleupagus/rm-PDFImage-Filter-warn

Browse Source 
Stop warning for non-Name /Filter entries in the `PDFImage` constructor (PR 9897 follow-up)
This commit is contained in:
Tim van der Meij 2018-08-03 23:21:14 +02:00 committed by GitHub
commit ee9a5c1269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/image.js
View File

@ -83,27 +83,24 @@ var PDFImage = (function PDFImageClosure() {
mask = null, isMask = false, pdfFunctionFactory, }) { mask = null, isMask = false, pdfFunctionFactory, }) {
this.image = image; this.image = image;
var dict = image.dict; var dict = image.dict;
if (dict.has('Filter')) {
const filter = dict.get('Filter');
if (isName(filter)) {
switch (filter.name) {
case 'JPXDecode':
var jpxImage = new JpxImage();
jpxImage.parseImageProperties(image.stream);
image.stream.reset();
image.width = jpxImage.width; const filter = dict.get('Filter');
image.height = jpxImage.height; if (isName(filter)) {
image.bitsPerComponent = jpxImage.bitsPerComponent; switch (filter.name) {
image.numComps = jpxImage.componentsCount; case 'JPXDecode':
break; var jpxImage = new JpxImage();
case 'JBIG2Decode': jpxImage.parseImageProperties(image.stream);
image.bitsPerComponent = 1; image.stream.reset();
image.numComps = 1;
break; image.width = jpxImage.width;
} image.height = jpxImage.height;
} else { image.bitsPerComponent = jpxImage.bitsPerComponent;
warn(`PDFImage - invalid /Filter entry in dictionary: "${filter}".`); image.numComps = jpxImage.componentsCount;
break;
case 'JBIG2Decode':
image.bitsPerComponent = 1;
image.numComps = 1;
break;
} }
} }
// TODO cache rendered images? // TODO cache rendered images?