Merge pull request #13932 from Snuffleupagus/oc-images

Support Optional Content in Image-/XObjects (issue 13931)

test/driver.js

@@ -519,7 +519,7 @@ var Driver = (function DriverClosure() {
             styleElement: xfaStyleElement,
           });
           loadingTask.promise.then(
-            doc => {
+            async doc => {
               if (task.enableXfa) {
                 task.fontRules = "";
                 for (const rule of xfaStyleElement.sheet.cssRules) {
@@ -531,6 +531,15 @@ var Driver = (function DriverClosure() {
               task.optionalContentConfigPromise =
                 doc.getOptionalContentConfig();
 
+              if (task.optionalContent) {
+                const entries = Object.entries(task.optionalContent),
+                  optionalContentConfig =
+                    await task.optionalContentConfigPromise;
+                for (const [id, visible] of entries) {
+                  optionalContentConfig.setVisibility(id, visible);
+                }
+              }
+
               this._nextPage(task, failure);
             },
             err => {

test/pdfs/.gitignore

@@ -442,6 +442,7 @@
 !issue8097_reduced.pdf
 !quadpoints.pdf
 !transparent.pdf
+!issue13931.pdf
 !xobject-image.pdf
 !issue6605.pdf
 !ccitt_EndOfBlock_false.pdf

test/test_manifest.json

@@ -5019,6 +5019,21 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "issue13931-default",
+       "file": "pdfs/issue13931.pdf",
+       "md5": "799d5025787115d22863ae23a3042491",
+       "rounds": 1,
+       "type": "eq"
+    },
+    {  "id": "issue13931-hidden",
+       "file": "pdfs/issue13931.pdf",
+       "md5": "799d5025787115d22863ae23a3042491",
+       "rounds": 1,
+       "type": "eq",
+       "optionalContent": {
+         "7R": false
+       }
+    },
     {  "id": "issue2829",
       "file": "pdfs/issue2829.pdf",
       "md5": "f32b28cf8792f6ccc470446bfbb38584",