Fix COSIndirect casts to COSDirect descendants (#659)

* Fix COSIndirect to COSArray casts * Fix COSIndirect to COSName casts
veraPDF · Feb 25, 2025 · 347ae53 · 347ae53
1 parent de7ccd7
commit 347ae53
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/verapdf/parser/postscript/PSObject.java b/src/main/java/org/verapdf/parser/postscript/PSObject.java
@@ -69,9 +69,9 @@ public static PSObject getPSObject(COSObject obj, boolean isExecutable) {
         }
         COSObjType type = obj.getType();
         if (type == COSObjType.COS_NAME && isExecutable) {
-            return new PSOperator((COSName) obj.get());
+            return new PSOperator((COSName) obj.getDirectBase());
         } else if (type == COSObjType.COS_ARRAY && isExecutable) {
-            return new PSProcedure((COSArray) obj.get());
+            return new PSProcedure((COSArray) obj.getDirectBase());
         } else if (type.isNumber() || type == COSObjType.COS_STRING ||
                 type == COSObjType.COS_BOOLEAN || type == COSObjType.COS_DICT ||
                 type == COSObjType.COS_NAME || type == COSObjType.COS_ARRAY) {

diff --git a/src/main/java/org/verapdf/pd/font/type1/Type1FontProgram.java b/src/main/java/org/verapdf/pd/font/type1/Type1FontProgram.java
@@ -281,7 +281,7 @@ private double[] getFontMatrix() {
         if (fontMatrixObject != null && fontMatrixObject.getType() == COSObjType.COS_ARRAY) {
             double[] res = new double[6];
             int pointer = 0;
-            for (COSObject obj : ((COSArray) fontMatrixObject.get())) {
+            for (COSObject obj : ((COSArray) fontMatrixObject.getDirectBase())) {
                 if (obj.getType().isNumber()) {
                     res[pointer++] = obj.getReal();
                 }
@@ -297,7 +297,7 @@ private void initializeEncoding() {
         if (encoding != null) {
             if (encoding.getType() == COSObjType.COS_ARRAY) {
                 int pointer = 0;
-                for (COSObject obj : ((COSArray) encoding.get())) {
+                for (COSObject obj : ((COSArray) encoding.getDirectBase())) {
                     if (pointer < 256) {
                         String glyphName = obj.getString();
                         this.encoding[pointer++] = glyphName == null ? "" : glyphName;

diff --git a/src/main/java/org/verapdf/pd/structure/PDNumberTreeNode.java b/src/main/java/org/verapdf/pd/structure/PDNumberTreeNode.java
@@ -104,7 +104,7 @@ public List<PDNumberTreeNode> parseKids() {
         COSObject kids = this.getKey(ASAtom.KIDS);
         if (kids != null && !kids.empty() && kids.getType() == COSObjType.COS_ARRAY) {
             List<PDNumberTreeNode> res = new ArrayList<>(kids.size());
-            for (COSObject obj : (COSArray) kids.get()) {
+            for (COSObject obj : (COSArray) kids.getDirectBase()) {
                 res.add(new PDNumberTreeNode(obj, parents));
             }
             return Collections.unmodifiableList(res);