From b99f9f26fe833aaf193f7ae8cf237ffeb713a712 Mon Sep 17 00:00:00 2001 From: RaphaelArnold Date: Thu, 3 Aug 2023 10:40:06 +0200 Subject: [PATCH] RED-7075: WatermarkRemoval improved --- .../commons/WatermarkRemovalService.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalService.java b/src/main/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalService.java index b318df1..e1fb30e 100644 --- a/src/main/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalService.java +++ b/src/main/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalService.java @@ -39,21 +39,20 @@ public class WatermarkRemovalService { PDFDoc pdfDoc = new PDFDoc(pdfFile); if(pdfDoc.getPageCount() < MIN_PAGES_THRESHOLD){ - log.debug("Document page count {} is below threshold {}", pdfDoc.getPageCount(), MIN_PAGES_THRESHOLD); - return; - } - - Map> formObjectsForPages = findAllFormObjectsAndImages(pdfDoc); - - List watermarkElementFeatures = filterSameFormObjectsOccuringOnMostPages(formObjectsForPages); - - if(watermarkElementFeatures.size() > 0){ - log.info("Watermark found and will be removed!"); + log.info("Document page count {} is below threshold {}", pdfDoc.getPageCount(), MIN_PAGES_THRESHOLD); } else { - log.info("No watermark found!"); - } + Map> formObjectsForPages = findAllFormObjectsAndImages(pdfDoc); - removeAllWatermarks(pdfDoc, watermarkElementFeatures); + List watermarkElementFeatures = filterSameFormObjectsOccuringOnMostPages(formObjectsForPages); + + if (watermarkElementFeatures.size() > 0) { + log.info("Watermark found and will be removed!"); + } else { + log.info("No watermark found!"); + } + + removeAllWatermarks(pdfDoc, watermarkElementFeatures); + } try { pdfDoc.save(out, SDFDoc.SaveMode.LINEARIZED, null);