Merge pull request #18269 from Snuffleupagus/issue-18259

Ensure that dependencies are added to the operatorList for locally cached images (issue 18259)
mozilla · Jun 18, 2024 · 4c82438 · 4c82438
2 parents c07dd17 + 22ca7d5
commit 4c82438
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -718,6 +718,7 @@ class PartialEvaluator {
 
       if (cacheKey) {
         const cacheData = {
+          objId,
           fn: OPS.paintImageMaskXObject,
           args,
           optionalContent,
@@ -870,6 +871,7 @@ class PartialEvaluator {
 
     if (cacheKey) {
       const cacheData = {
+        objId,
         fn: OPS.paintImageXObject,
         args,
         optionalContent,
@@ -1783,6 +1785,9 @@ class PartialEvaluator {
             if (isValidName) {
               const localImage = localImageCache.getByName(name);
               if (localImage) {
+                if (localImage.objId) {
+                  operatorList.addDependency(localImage.objId);
+                }
                 operatorList.addImageOps(
                   localImage.fn,
                   localImage.args,
@@ -1807,6 +1812,9 @@ class PartialEvaluator {
                     localImageCache.getByRef(xobj) ||
                     self._regionalImageCache.getByRef(xobj);
                   if (localImage) {
+                    if (localImage.objId) {
+                      operatorList.addDependency(localImage.objId);
+                    }
                     operatorList.addImageOps(
                       localImage.fn,
                       localImage.args,
@@ -1928,6 +1936,9 @@ class PartialEvaluator {
             if (cacheKey) {
               const localImage = localImageCache.getByName(cacheKey);
               if (localImage) {
+                if (localImage.objId) {
+                  operatorList.addDependency(localImage.objId);
+                }
                 operatorList.addImageOps(
                   localImage.fn,
                   localImage.args,