Marmelator/pdftron-logic-commons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

hotfix: Fixed npe for inline image where getXObject() returns null

Browse Source
This commit is contained in:
deiflaender 2023-08-11 15:10:40 +02:00
parent db70ba5aa0
commit f39ed2e586
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalService.java
View File

@ -118,6 +118,9 @@ public class WatermarkRemovalService {
if (element.getType() == Element.e_form) { if (element.getType() == Element.e_form) {
processXObject(element, visitedXObjIds, elementFeaturesLinkedList, formObjectsOccuringMoreThanOnceOnAPage, minAreaCoveringPage); processXObject(element, visitedXObjIds, elementFeaturesLinkedList, formObjectsOccuringMoreThanOnceOnAPage, minAreaCoveringPage);
} else if (element.getType() == Element.e_image || element.getType() == Element.e_inline_image) { } else if (element.getType() == Element.e_image || element.getType() == Element.e_inline_image) {
if (element.getXObject() == null) {
return;
}
processImages(element, elementFeaturesLinkedList); processImages(element, elementFeaturesLinkedList);
} }
} }
@ -220,9 +223,10 @@ public class WatermarkRemovalService {
switch (element.getType()) { switch (element.getType()) {
case Element.e_image, Element.e_inline_image -> { case Element.e_image, Element.e_inline_image -> {
if (element.getBBox() == null) { if (element.getBBox() == null) {
writer.writeElement(element);
continue; continue;
} }
if (element.getBBox().getHeight() * element.getBBox().getWidth() < minAreaCoveringFromPage) { if (element.getBBox().getHeight() * element.getBBox().getWidth() < minAreaCoveringFromPage || element.getXObject() == null) {
writer.writeElement(element); writer.writeElement(element);
continue; continue;
} }

2
src/test/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalServiceTest.java
View File

@ -23,7 +23,7 @@ class WatermarkRemovalServiceTest {
WatermarkRemovalService watermarkRemovalService = new WatermarkRemovalService(); WatermarkRemovalService watermarkRemovalService = new WatermarkRemovalService();
String filename = "files/PO_82_277_H_2013 (1).pdf"; String filename = "files/18_TiltPlus_IrritacaoOcularAguda.pdf";
String tmpFilename = createTmpFileName(filename, "WATERMARK_REMOVAL"); String tmpFilename = createTmpFileName(filename, "WATERMARK_REMOVAL");
try (var in = this.getClass().getClassLoader().getResourceAsStream(filename); var out = new FileOutputStream(tmpFilename)) { try (var in = this.getClass().getClassLoader().getResourceAsStream(filename); var out = new FileOutputStream(tmpFilename)) {