Merge pull request #12922 from Snuffleupagus/getTextContent-globalImageCache

Ignore globally cached images in `PartialEvaluator.getTextContent` (PR 11930 follow-up)
This commit is contained in:
Tim van der Meij 2021-01-28 23:44:10 +01:00 committed by GitHub
commit e4e92d10e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -2515,6 +2515,15 @@ class PartialEvaluator {
return;
}
const globalImage = self.globalImageCache.getData(
xobj,
self.pageIndex
);
if (globalImage) {
resolveXObject();
return;
}
xobj = xref.fetch(xobj);
}

View File

@ -247,13 +247,14 @@ class GlobalImageCache {
if (pageIndexSet.size < GlobalImageCache.NUM_PAGES_THRESHOLD) {
return null;
}
if (!this._imageCache.has(ref)) {
const imageData = this._imageCache.get(ref);
if (!imageData) {
return null;
}
// Ensure that we keep track of all pages containing the image reference.
pageIndexSet.add(pageIndex);
return this._imageCache.get(ref);
return imageData;
}
setData(ref, data) {