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

Merge pull request #15221 from Snuffleupagus/issue-15220

Browse Source 
Support images with /Filter-entries that contain Arrays (issue 15220)
This commit is contained in:
Jonas Jenwald 2022-07-25 11:14:51 +02:00 committed by GitHub
commit 8ebd2d3dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/image.js
View File

@ -103,25 +103,31 @@ class PDFImage {
const dict = image.dict; const dict = image.dict;
const filter = dict.get("F", "Filter"); const filter = dict.get("F", "Filter");
let filterName;
if (filter instanceof Name) { if (filter instanceof Name) {
switch (filter.name) { filterName = filter.name;
case "JPXDecode": } else if (Array.isArray(filter)) {
const jpxImage = new JpxImage(); const filterZero = xref.fetchIfRef(filter[0]);
jpxImage.parseImageProperties(image.stream); if (filterZero instanceof Name) {
image.stream.reset(); filterName = filterZero.name;
image.width = jpxImage.width;
image.height = jpxImage.height;
image.bitsPerComponent = jpxImage.bitsPerComponent;
image.numComps = jpxImage.componentsCount;
break;
case "JBIG2Decode":
image.bitsPerComponent = 1;
image.numComps = 1;
break;
} }
} }
// TODO cache rendered images? switch (filterName) {
case "JPXDecode":
const jpxImage = new JpxImage();
jpxImage.parseImageProperties(image.stream);
image.stream.reset();
image.width = jpxImage.width;
image.height = jpxImage.height;
image.bitsPerComponent = jpxImage.bitsPerComponent;
image.numComps = jpxImage.componentsCount;
break;
case "JBIG2Decode":
image.bitsPerComponent = 1;
image.numComps = 1;
break;
}
let width = dict.get("W", "Width"); let width = dict.get("W", "Width");
let height = dict.get("H", "Height"); let height = dict.get("H", "Height");

1
test/pdfs/issue15220.pdf.link Normal file
View File

@ -0,0 +1 @@
https://github.com/mozilla/pdf.js/files/9178570/issue15220_page2.pdf

8
test/test_manifest.json
View File

@ -152,6 +152,14 @@
"lastPage": 1, "lastPage": 1,
"type": "eq" "type": "eq"
}, },
{ "id": "issue15220",
"file": "pdfs/issue15220.pdf",
"md5": "0864a9e3860c0cb5e98b5eb23287fba4",
"rounds": 1,
"link": true,
"lastPage": 1,
"type": "eq"
},
{ "id": "issue11549", { "id": "issue11549",
"file": "pdfs/issue11549_reduced.pdf", "file": "pdfs/issue11549_reduced.pdf",
"md5": "a1ea636f413e02e10dbdf379ab4a99ae", "md5": "a1ea636f413e02e10dbdf379ab4a99ae",