[RELEASE] iText pdfSweep 4.0.2

itext · Jan 30, 2024 · 97729a1 · 97729a1
2 parents 6ce10e6 + 094d013
commit 97729a1
Show file tree

Hide file tree

Showing 47 changed files with 75 additions and 56 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>8.0.2</version>
+ <version>8.0.3</version>
  <relativePath />
  </parent>
 
  <artifactId>cleanup</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
 
  <name>pdfSweep</name>
  <description>Redact PDF documents. If you have to share PDFs with different departments or send them out of house, but they

diff --git a/src/main/java/com/itextpdf/pdfcleanup/CleanUpProperties.java b/src/main/java/com/itextpdf/pdfcleanup/CleanUpProperties.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/FilteredImagesCache.java b/src/main/java/com/itextpdf/pdfcleanup/FilteredImagesCache.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/LineDashPattern.java b/src/main/java/com/itextpdf/pdfcleanup/LineDashPattern.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpEventListener.java b/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpEventListener.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpFilter.java b/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpFilter.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpLocation.java b/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpLocation.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessor.java b/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessor.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.
@@ -675,15 +675,15 @@ private PdfImageXObject getFilteredImage(FilteredImagesCache.FilteredImageKey fi
  PdfCleanUpFilter.FilterResult<ImageData> imageFilterResult = filter.filterImage(filteredImageKey);
  if (imageFilterResult.isModified()) {
  ImageData filteredImageData = imageFilterResult.getFilterResult();
- if (Boolean.TRUE.equals(originalImage.getPdfObject().getAsBool(PdfName.ImageMask))) {
- if (!PdfCleanUpFilter.imageSupportsDirectCleanup(originalImage)) {
- Logger logger = LoggerFactory.getLogger(PdfCleanUpProcessor.class);
- logger.error(CleanUpLogMessageConstant.IMAGE_MASK_CLEAN_UP_NOT_SUPPORTED);
- } else {
- filteredImageData.makeMask();
- }
- }
  if (filteredImageData != null) {
+ if (Boolean.TRUE.equals(originalImage.getPdfObject().getAsBool(PdfName.ImageMask))) {
+ if (!PdfCleanUpFilter.imageSupportsDirectCleanup(originalImage)) {
+ Logger logger = LoggerFactory.getLogger(PdfCleanUpProcessor.class);
+ logger.error(CleanUpLogMessageConstant.IMAGE_MASK_CLEAN_UP_NOT_SUPPORTED);
+ } else {
+ filteredImageData.makeMask();
+ }
+ }
  imageToWrite = new PdfImageXObject(filteredImageData);
  getFilteredImagesCache().put(filteredImageKey, imageToWrite);
 

diff --git a/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpTool.java b/src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpTool.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/PdfCleaner.java b/src/main/java/com/itextpdf/pdfcleanup/PdfCleaner.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/TextPositioning.java b/src/main/java/com/itextpdf/pdfcleanup/TextPositioning.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/actions/data/PdfSweepProductData.java b/src/main/java/com/itextpdf/pdfcleanup/actions/data/PdfSweepProductData.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.
@@ -31,9 +31,9 @@ public class PdfSweepProductData {
  public static final String PDF_SWEEP_PRODUCT_NAME = "pdfSweep";
  public static final String PDF_SWEEP_PUBLIC_PRODUCT_NAME = PDF_SWEEP_PRODUCT_NAME;
 
- private static final String PDF_SWEEP_VERSION = "4.0.1";
+ private static final String PDF_SWEEP_VERSION = "4.0.2";
  private static final int PDF_SWEEP_COPYRIGHT_SINCE = 2000;
- private static final int PDF_SWEEP_COPYRIGHT_TO = 2023;
+ private static final int PDF_SWEEP_COPYRIGHT_TO = 2024;
 
  private static final ProductData PDF_SWEEP_PRODUCT_DATA = new ProductData(PDF_SWEEP_PUBLIC_PRODUCT_NAME,
  PDF_SWEEP_PRODUCT_NAME, PDF_SWEEP_VERSION, PDF_SWEEP_COPYRIGHT_SINCE, PDF_SWEEP_COPYRIGHT_TO);

diff --git a/src/main/java/com/itextpdf/pdfcleanup/actions/event/PdfSweepProductEvent.java b/src/main/java/com/itextpdf/pdfcleanup/actions/event/PdfSweepProductEvent.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/autosweep/CommonRegex.java b/src/main/java/com/itextpdf/pdfcleanup/autosweep/CommonRegex.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/autosweep/CompositeCleanupStrategy.java b/src/main/java/com/itextpdf/pdfcleanup/autosweep/CompositeCleanupStrategy.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/autosweep/ICleanupStrategy.java b/src/main/java/com/itextpdf/pdfcleanup/autosweep/ICleanupStrategy.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/autosweep/PdfAutoSweepTools.java b/src/main/java/com/itextpdf/pdfcleanup/autosweep/PdfAutoSweepTools.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/autosweep/RegexBasedCleanupStrategy.java b/src/main/java/com/itextpdf/pdfcleanup/autosweep/RegexBasedCleanupStrategy.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/exceptions/CleanupExceptionMessageConstant.java b/src/main/java/com/itextpdf/pdfcleanup/exceptions/CleanupExceptionMessageConstant.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/logs/CleanUpLogMessageConstant.java b/src/main/java/com/itextpdf/pdfcleanup/logs/CleanUpLogMessageConstant.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/util/CleanUpCsCompareUtil.java b/src/main/java/com/itextpdf/pdfcleanup/util/CleanUpCsCompareUtil.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/util/CleanUpHelperUtil.java b/src/main/java/com/itextpdf/pdfcleanup/util/CleanUpHelperUtil.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/main/java/com/itextpdf/pdfcleanup/util/CleanUpImageUtil.java b/src/main/java/com/itextpdf/pdfcleanup/util/CleanUpImageUtil.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/BigDocumentAutoCleanUpTest.java b/src/test/java/com/itextpdf/pdfcleanup/BigDocumentAutoCleanUpTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/BigDocumentCleanUpTest.java b/src/test/java/com/itextpdf/pdfcleanup/BigDocumentCleanUpTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/CleanUpAnnotationTest.java b/src/test/java/com/itextpdf/pdfcleanup/CleanUpAnnotationTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/CleanUpCsCompareUtilTest.java b/src/test/java/com/itextpdf/pdfcleanup/CleanUpCsCompareUtilTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/CleanUpImageUtilTest.java b/src/test/java/com/itextpdf/pdfcleanup/CleanUpImageUtilTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/CleanUpInvalidPdfTest.java b/src/test/java/com/itextpdf/pdfcleanup/CleanUpInvalidPdfTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/CleanUpTaggedPdfTest.java b/src/test/java/com/itextpdf/pdfcleanup/CleanUpTaggedPdfTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/CleanupLicenseEventsTest.java b/src/test/java/com/itextpdf/pdfcleanup/CleanupLicenseEventsTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/FilteredImagesCacheTest.java b/src/test/java/com/itextpdf/pdfcleanup/FilteredImagesCacheTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/PdfAutoSweepToolsTest.java b/src/test/java/com/itextpdf/pdfcleanup/PdfAutoSweepToolsTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpFilterUnitTest.java b/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpFilterUnitTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessorUnitTest.java b/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessorUnitTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpToolTest.java b/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpToolTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.
@@ -1063,6 +1063,25 @@ public void checkUnSupportedImageTypeTest() throws IOException {
  pdfDocument.close();
  }
 
+ @Test
+ public void cleanUpFullyFilteredImageTest() throws IOException, InterruptedException {
+ String input = INPUT_PATH + "fullyFilteredImageDocument.pdf";
+ String output = OUTPUT_PATH + "fullyFilteredImageDocument.pdf";
+ String cmp = INPUT_PATH + "cmp_fullyFilteredImageDocument.pdf";
+
+ PdfDocument pdfDocument = new PdfDocument(new PdfReader(input), new PdfWriter(output, new WriterProperties()));
+ PdfCleanUpTool workingTool = new PdfCleanUpTool(pdfDocument);
+ int pageIndex = 1;
+ Rectangle area = pdfDocument.getPage(pageIndex).getPageSize();
+ workingTool.addCleanupLocation(new PdfCleanUpLocation(pageIndex, area));
+
+ workingTool.cleanUp();
+
+ pdfDocument.close();
+
+ compareByContent(cmp, output, OUTPUT_PATH, "diff_fullyFilteredImageDocument_");
+ }
+
  private void cleanUp(String input, String output, List<PdfCleanUpLocation> cleanUpLocations) throws IOException {
  PdfDocument pdfDocument = new PdfDocument(new PdfReader(input), new PdfWriter(output));
 

diff --git a/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpToolWithInlineImagesTest.java b/src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpToolWithInlineImagesTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/RectangleTest.java b/src/test/java/com/itextpdf/pdfcleanup/RectangleTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/TextPositioningTest.java b/src/test/java/com/itextpdf/pdfcleanup/TextPositioningTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/images/CleanUpImageIndexedColorSpaceTest.java b/src/test/java/com/itextpdf/pdfcleanup/images/CleanUpImageIndexedColorSpaceTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.

diff --git a/src/test/java/com/itextpdf/pdfcleanup/images/CleanUpTransformedImageTest.java b/src/test/java/com/itextpdf/pdfcleanup/images/CleanUpTransformedImageTest.java
@@ -1,6 +1,6 @@
 /*
  This file is part of the iText (R) project.
- Copyright (c) 1998-2023 Apryse Group NV
+ Copyright (c) 1998-2024 Apryse Group NV
  Authors: Apryse Software.
 
  This program is offered under a commercial and under the AGPL license.