From 019d2817f0369a813b2c2b26a24d195f953bf661 Mon Sep 17 00:00:00 2001 From: Roman Kokhnovich Date: Tue, 5 Aug 2025 15:57:29 +0300 Subject: [PATCH 1/3] Update how we obtain arlington PDF vesion --- .../java/org/verapdf/gf/model/GFModelParser.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java b/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java index bf3125f0f..3831d510d 100644 --- a/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java +++ b/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java @@ -204,10 +204,17 @@ private static PDFAFlavour obtainArlingtonFlavour(PDDocument document, PDFAFlavo } COSDocument cosDocument = document.getDocument(); Float version = cosDocument != null ? cosDocument.getHeader().getVersion() : null; - if (version == null) { - PDCatalog catalog = document.getCatalog(); - ASAtom versionValue = catalog != null ? catalog.getNameKey(ASAtom.VERSION) : null; - version = versionValue != null ? Float.valueOf(versionValue.getValue()) : null; + + PDCatalog catalog = document.getCatalog(); + ASAtom versionValue = catalog != null ? catalog.getNameKey(ASAtom.VERSION) : null; + Float catalogVersion = versionValue != null ? Float.valueOf(versionValue.getValue()) : null; + + if (catalogVersion != null && version != null) { + if (version < catalogVersion) { + version = catalogVersion; + } + } else if (catalogVersion != null) { + version = catalogVersion; } if (version == null) { return defaultFlavour; From 292a740ad660a6f1010afae44a61998fdd275ad9 Mon Sep 17 00:00:00 2001 From: Roman Kokhnovich Date: Tue, 5 Aug 2025 16:04:57 +0300 Subject: [PATCH 2/3] Update GFModelParser.java --- .../main/java/org/verapdf/gf/model/GFModelParser.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java b/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java index 3831d510d..dc3ed5c16 100644 --- a/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java +++ b/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java @@ -209,13 +209,9 @@ private static PDFAFlavour obtainArlingtonFlavour(PDDocument document, PDFAFlavo ASAtom versionValue = catalog != null ? catalog.getNameKey(ASAtom.VERSION) : null; Float catalogVersion = versionValue != null ? Float.valueOf(versionValue.getValue()) : null; - if (catalogVersion != null && version != null) { - if (version < catalogVersion) { - version = catalogVersion; - } - } else if (catalogVersion != null) { - version = catalogVersion; - } + if (catalogVersion != null && (version == null || version < catalogVersion)) { + version = catalogVersion; + } if (version == null) { return defaultFlavour; } From 4b07f2d6a1cb2a5580d6bf86307c015b191dc1b0 Mon Sep 17 00:00:00 2001 From: Roman Kokhnovich Date: Tue, 5 Aug 2025 16:28:39 +0300 Subject: [PATCH 3/3] Fix tabulations --- .../src/main/java/org/verapdf/gf/model/GFModelParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java b/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java index dc3ed5c16..25d357594 100644 --- a/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java +++ b/validation-model/src/main/java/org/verapdf/gf/model/GFModelParser.java @@ -210,8 +210,8 @@ private static PDFAFlavour obtainArlingtonFlavour(PDDocument document, PDFAFlavo Float catalogVersion = versionValue != null ? Float.valueOf(versionValue.getValue()) : null; if (catalogVersion != null && (version == null || version < catalogVersion)) { - version = catalogVersion; - } + version = catalogVersion; + } if (version == null) { return defaultFlavour; }