Merge pull request #14569 from brendandahl/smask-state

Fix canvas state getting out of sync from smasks. (bug 1755507)

test/pdfs/.gitignore

@@ -175,6 +175,7 @@
 !issue8565.pdf
 !clippath.pdf
 !issue8795_reduced.pdf
+!bug1755507.pdf
 !close-path-bug.pdf
 !issue6019.pdf
 !issue6621.pdf
@@ -491,6 +492,7 @@
 !pr12564.pdf
 !pr12828.pdf
 !secHandler.pdf
+!issue14297.pdf
 !rc_annotation.pdf
 !issue14267.pdf
 !PDFBOX-4352-0.pdf

test/test_manifest.json

@@ -2164,6 +2164,12 @@
        "type": "eq",
        "about": "Glyph that gets mapped to unicode non-breaking-space."
     },
+    {  "id": "issue14297",
+       "file": "pdfs/issue14297.pdf",
+       "md5": "46eb3d4d4bc47c8009fc4c699d213a18",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "simpletype3font",
        "file": "pdfs/simpletype3font.pdf",
        "md5": "b374c7543920840c61999e9e86939f99",
@@ -2513,6 +2519,12 @@
        "lastPage": 2,
        "type": "eq"
     },
+    {  "id": "bug1755507",
+       "file": "pdfs/bug1755507.pdf",
+       "md5": "319d73b8fd680cdc583d69b7f7ab29e9",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "issue9367",
        "file": "pdfs/issue9367.pdf",
        "md5": "81a2c6f1fe5d1bb00ff0479aa6547155",