Skip to content

Commit 2b51cad

Browse files
Use methods isOutsideCropBox and hasCorrectAlt from verapdf-parser
1 parent 106fdac commit 2b51cad

3 files changed

Lines changed: 3 additions & 31 deletions

File tree

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDAnnot.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,13 +308,7 @@ public String getAlt() {
308308

309309
@Override
310310
public Boolean getisOutsideCropBox() {
311-
double[] cropBox = page.getCropBox();
312-
double[] rectangle = ((PDAnnotation)simplePDObject).getRect();
313-
if (rectangle != null && rectangle.length >= 4) {
314-
return cropBox[1] >= rectangle[3] || cropBox[0] >= rectangle[2]
315-
|| cropBox[3] <= rectangle[1] || cropBox[2] <= rectangle[0];
316-
}
317-
return null;
311+
return PDAnnotation.isOutsideCropBox(page, (PDAnnotation)simplePDObject);
318312
}
319313

320314
private static Double getDifference(double[] array, int shift) {

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/actions/GFPDMediaClip.java

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
package org.verapdf.gf.model.impl.pd.actions;
2222

2323
import org.verapdf.as.ASAtom;
24-
import org.verapdf.cos.COSArray;
25-
import org.verapdf.cos.COSObjType;
2624
import org.verapdf.cos.COSObject;
2725
import org.verapdf.gf.model.impl.pd.GFPDObject;
2826
import org.verapdf.model.pdlayer.PDMediaClip;
@@ -51,20 +49,6 @@ public String getAlt() {
5149

5250
@Override
5351
public Boolean gethasCorrectAlt() {
54-
COSObject object = simplePDObject.getKey(ASAtom.ALT);
55-
if (object == null || object.getType() != COSObjType.COS_ARRAY) {
56-
return false;
57-
}
58-
COSArray array = (COSArray)object.getDirectBase();
59-
if (array.size() % 2 != 0) {
60-
return false;
61-
}
62-
for (int i = 0; i < array.size(); i++) {
63-
COSObject elem = array.at(i);
64-
if (elem.getType() != COSObjType.COS_STRING || (i % 2 == 1 && elem.getString().isEmpty())) {
65-
return false;
66-
}
67-
}
68-
return true;
52+
return ((org.verapdf.pd.actions.PDMediaClip)simplePDObject).hasCorrectAlt();
6953
}
7054
}

wcag-validation/src/main/java/org/verapdf/gf/model/impl/sa/GFSAAnnotation.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,7 @@ public static GFSAAnnotation createAnnot(PDAnnotation annot, PDPage page) {
9292

9393
@Override
9494
public Boolean getisOutsideCropBox() {
95-
double[] cropBox = page.getCropBox();
96-
double[] rectangle = annot.getRect();
97-
if (rectangle != null && rectangle.length >= 4) {
98-
return cropBox[1] >= rectangle[3] || cropBox[0] >= rectangle[2]
99-
|| cropBox[3] <= rectangle[1] || cropBox[2] <= rectangle[0];
100-
}
101-
return null;
95+
return PDAnnotation.isOutsideCropBox(page, annot);
10296
}
10397

10498
@Override

0 commit comments

Comments
 (0)