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

Merge pull request #11974 from Snuffleupagus/sendImgData

Browse Source 
A couple of small image caching/sending improvements
This commit is contained in:
Tim van der Meij 2020-06-07 13:53:26 +02:00 committed by GitHub
commit c97200ff59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/evaluator.js
View File

@ -439,6 +439,30 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
});
},
_sendImgData(objId, imgData, cacheGlobally = false) {
const transfers = imgData ? [imgData.data.buffer] : null;
if (this.parsingType3Font) {
return this.handler.sendWithPromise(
"commonobj",
[objId, "FontType3Res", imgData],
transfers
);
}
if (cacheGlobally) {
return this.handler.send(
"commonobj",
[objId, "Image", imgData],
transfers
);
}
return this.handler.send(
"obj",
[objId, this.pageIndex, "Image", imgData],
transfers
);
},
async buildPaintImageXObject({
resources,
image,
@ -552,42 +576,12 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
.then(imageObj => {
imgData = imageObj.createImageData(/* forceRGBA = */ false);
if (this.parsingType3Font) {
return this.handler.sendWithPromise(
"commonobj",
[objId, "FontType3Res", imgData],
[imgData.data.buffer]
);
} else if (cacheGlobally) {
this.handler.send(
"commonobj",
[objId, "Image", imgData],
[imgData.data.buffer]
);
return undefined;
}
this.handler.send(
"obj",
[objId, this.pageIndex, "Image", imgData],
[imgData.data.buffer]
);
return undefined;
return this._sendImgData(objId, imgData, cacheGlobally);
})
.catch(reason => {
warn("Unable to decode image: " + reason);
if (this.parsingType3Font) {
return this.handler.sendWithPromise("commonobj", [
objId,
"FontType3Res",
null,
]);
} else if (cacheGlobally) {
this.handler.send("commonobj", [objId, "Image", null]);
return undefined;
}
this.handler.send("obj", [objId, this.pageIndex, "Image", null]);
return undefined;
return this._sendImgData(objId, /* imgData = */ null, cacheGlobally);
});
if (this.parsingType3Font) {

5
src/core/image_utils.js
View File

@ -107,11 +107,10 @@ class GlobalImageCache {
}
getData(ref, pageIndex) {
if (!this._refCache.has(ref)) {
const pageIndexSet = this._refCache.get(ref);
if (!pageIndexSet) {
return null;
}
const pageIndexSet = this._refCache.get(ref);
if (pageIndexSet.size < GlobalImageCache.NUM_PAGES_THRESHOLD) {
return null;
}