Fix #779, #780

pkg/pdfcpu/validate/annotation.go

@@ -376,10 +376,18 @@ func validateAnnotationDictLink(xRefTable *model.XRefTable, d types.Dict, dictNa
 func validateAnnotationDictFreeTextPart1(xRefTable *model.XRefTable, d types.Dict, dictName string) error {
 
 	// DA, required, string
-	_, err := validateStringEntry(xRefTable, d, dictName, "DA", REQUIRED, model.V10, nil)
+	validate := validateDA
+	if xRefTable.ValidationMode == model.ValidationRelaxed {
+		validate = validateDARelaxed
+	}
+	da, err := validateStringEntry(xRefTable, d, dictName, "DA", REQUIRED, model.V10, validate)
 	if err != nil {
 		return err
 	}
+	if xRefTable.ValidationMode == model.ValidationRelaxed && da != nil {
+		// Repair
+		d["DA"] = types.StringLiteral(*da)
+	}
 
 	// Q, optional, integer, since V1.4, 0,1,2
 	sinceVersion := model.V14
@@ -1177,10 +1185,18 @@ func validateAnnotationDictRedact(xRefTable *model.XRefTable, d types.Dict, dict
 	}
 
 	// DA, required, byte string
-	_, err = validateStringEntry(xRefTable, d, dictName, "DA", REQUIRED, model.V10, nil)
+	validate := validateDA
+	if xRefTable.ValidationMode == model.ValidationRelaxed {
+		validate = validateDARelaxed
+	}
+	da, err := validateStringEntry(xRefTable, d, dictName, "DA", REQUIRED, model.V10, validate)
 	if err != nil {
 		return err
 	}
+	if xRefTable.ValidationMode == model.ValidationRelaxed && da != nil {
+		// Repair
+		d["DA"] = types.StringLiteral(*da)
+	}
 
 	// Q, optional, integer
 	_, err = validateIntegerEntry(xRefTable, d, dictName, "Q", OPTIONAL, model.V10, nil)

pkg/pdfcpu/validate/form.go

@@ -234,6 +234,10 @@ func validateFormFieldDA(xRefTable *model.XRefTable, d types.Dict, dictName stri
 		if err != nil {
 			return false, err
 		}
+		if xRefTable.ValidationMode == model.ValidationRelaxed && da != nil {
+			// Repair
+			d["DA"] = types.StringLiteral(*da)
+		}
 
 		return da != nil && *da != "", nil
 	}
@@ -551,10 +555,18 @@ func validateForm(xRefTable *model.XRefTable, rootDict types.Dict, required bool
 	dictName := "acroFormDict"
 
 	// DA: optional, string
-	da, err := validateStringEntry(xRefTable, d, dictName, "DA", OPTIONAL, model.V10, validateDA)
+	validate := validateDA
+	if xRefTable.ValidationMode == model.ValidationRelaxed {
+		validate = validateDARelaxed
+	}
+	da, err := validateStringEntry(xRefTable, d, dictName, "DA", OPTIONAL, model.V10, validate)
 	if err != nil {
 		return err
 	}
+	if xRefTable.ValidationMode == model.ValidationRelaxed && da != nil {
+		// Repair
+		d["DA"] = types.StringLiteral(*da)
+	}
 
 	requiresDA := da == nil || len(*da) == 0
 

pkg/pdfcpu/validate/object.go

@@ -1032,7 +1032,7 @@ func decodeString(o types.Object, dictName, entryName string) (s string, err err
 	case types.HexLiteral:
 		s, err = types.HexLiteralToString(o)
 	default:
-		err = errors.Errorf("pdfcpu: decodeString: dict=%s entry=%s invalid type", dictName, entryName)
+		err = errors.Errorf("pdfcpu: decodeString: dict=%s entry=%s invalid type %T", dictName, entryName, o)
 	}
 	return s, err
 }

pkg/pdfcpu/validate/structTree.go

@@ -17,6 +17,8 @@ limitations under the License.
 package validate
 
 import (
+	"strconv"
+
 	"github.com/pdfcpu/pdfcpu/pkg/pdfcpu/model"
 	"github.com/pdfcpu/pdfcpu/pkg/pdfcpu/types"
 	"github.com/pkg/errors"
@@ -353,7 +355,17 @@ func validateStructElementDictPart1(xRefTable *model.XRefTable, d types.Dict, di
 	// S: structure type, required, name, see 14.7.3 and Annex E.
 	_, err := validateNameEntry(xRefTable, d, dictName, "S", OPTIONAL, model.V10, nil)
 	if err != nil {
-		return err
+		if xRefTable.ValidationMode == model.ValidationStrict {
+			return err
+		}
+		i, err := validateIntegerEntry(xRefTable, d, dictName, "S", OPTIONAL, model.V10, nil)
+		if err != nil {
+			return err
+		}
+		if i != nil {
+			// Repair
+			d["S"] = types.Name(strconv.Itoa((*i).Value()))
+		}
 	}
 
 	// P: immediate parent, required, indirect reference