aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-pdfbox-2
diff options
context:
space:
mode:
authorEmina Ahmetovic <emina.ahmetovic@egiz.gv.at>2020-10-30 09:37:01 +0100
committerEmina Ahmetovic <emina.ahmetovic@egiz.gv.at>2020-10-30 09:37:01 +0100
commitcbaa725f4940ba0677feaa76a4556c1d9a14efc5 (patch)
treea22a629d998ad61d6f5cbeec8b439245731ef4bf /pdf-as-pdfbox-2
parent7f66428916800f37fcc3ea67310d2ef73eb2fa38 (diff)
parent587b3c52aff9eaca6f02279a5976aeeadf08c124 (diff)
downloadpdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.gz
pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.bz2
pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.zip
resolving merge conflicts
Diffstat (limited to 'pdf-as-pdfbox-2')
-rw-r--r--pdf-as-pdfbox-2/build.gradle6
-rw-r--r--pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java5
2 files changed, 6 insertions, 5 deletions
diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle
index 5f05277b..282c7a9e 100644
--- a/pdf-as-pdfbox-2/build.gradle
+++ b/pdf-as-pdfbox-2/build.gradle
@@ -33,9 +33,9 @@ dependencies {
compile project (':pdf-as-lib')
compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
compile 'org.slf4j:jcl-over-slf4j:1.7.18'
- compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.13'
- compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.13'
- compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.13'
+ compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
+ compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
+ compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
compile group: 'commons-io', name: 'commons-io', version: '2.4'
compile group: 'ognl', name: 'ognl', version: '3.0.6'
testCompile group: 'junit', name: 'junit', version: '4.+'
diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java
index b797fec8..d30604d3 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java
@@ -324,8 +324,9 @@ public class PDFAsVisualSignatureBuilder extends PDVisibleSigBuilder implements
// String innerFormComment = "q 1 0 0 1 0 0 cm /" + imageObjectName +
// " Do Q\n";
- String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "ISO-8859-1");
-
+ //String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "ISO-8859-1");
+ String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "UTF-8");
+
// .getInputStreamAsString();//TODO: pdfbox2 - get the string from the stream
// logger.debug("Inner Form Stream: " + innerFormComment);