[RELEASE] iText pdfSweep 5.0.4

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>9.3.0</version>
+    <version>9.4.0</version>
     <relativePath />
   </parent>
 
   <artifactId>cleanup</artifactId>
-  <version>5.0.3</version>
+  <version>5.0.4</version>
 
   <name>pdfSweep</name>
   <description>Redact PDF documents. If you have to share PDFs with different departments or send them out of house, but
@@ -34,6 +34,12 @@
     <itext.version>${project.parent.version}</itext.version>
     <sourceFolder>${project.basedir}/src/main/java</sourceFolder>
     <testSourceFolder>${project.basedir}/src/test/java</testSourceFolder>
+
+    <sharpen.phase>install</sharpen.phase>
+    <sharpen.projectName>cleanup</sharpen.projectName>
+    <sharpen.cSharpTargetFolder>./../../sharp/cleanup</sharpen.cSharpTargetFolder>
+    <sharpen.cSharpSourceCodeDestination>itext/itext.cleanup</sharpen.cSharpSourceCodeDestination>
+    <sharpen.cSharpTestCodeDestination>itext.tests/itext.cleanup.tests</sharpen.cSharpTestCodeDestination>
   </properties>
 
   <dependencies>
@@ -100,48 +106,4 @@
       <url>https://repo.itextsupport.com/releases</url>
     </repository>
   </repositories>
-
-  <profiles>
-    <profile>
-      <id>with-sharpen</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>sharpen</groupId>
-            <artifactId>sharpen-maven-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <executions>
-              <execution>
-                <phase>install</phase>
-                <goals>
-                  <goal>sharpen</goal>
-                </goals>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>sharpen</groupId>
-                <artifactId>standard-framework-mapping</artifactId>
-                <version>1.0-SNAPSHOT</version>
-              </dependency>
-            </dependencies>
-            <configuration>
-              <projectName>cleanup</projectName>
-              <cSharpTargetFolder>./../../sharp/cleanup</cSharpTargetFolder>
-              <cSharpSourceCodeDestination>itext/itext.cleanup</cSharpSourceCodeDestination>
-              <cSharpTestCodeDestination>itext.tests/itext.cleanup.tests</cSharpTestCodeDestination>
-              <buildDotnet>${sharpen.builddotnet}</buildDotnet>
-              <showDiff>${sharpen.showdiff}</showDiff>
-              <sourceCodeFiles>
-                <file>**/src/main/java/**/*.java</file>
-              </sourceCodeFiles>
-              <testCodeFiles>
-                <file>**/src/test/java/**/*.java</file>
-              </testCodeFiles>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessor.java

@@ -723,6 +723,9 @@ private PdfImageXObject getFilteredImage(FilteredImagesCache.FilteredImageKey fi
                             imageToWrite.put(PdfName.SMaskInData, originalImage.getPdfObject().get(PdfName.SMaskInData));
                         }
                     }
+                    if (originalImage.getPdfObject().containsKey(PdfName.Decode)) {
+                        imageToWrite.put(PdfName.Decode, originalImage.getPdfObject().get(PdfName.Decode));
+                    }
                 }
             } else {
                 imageToWrite = originalImage;

src/main/java/com/itextpdf/pdfcleanup/actions/data/PdfSweepProductData.java

@@ -31,7 +31,7 @@ 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 = "5.0.3";
+    private static final String PDF_SWEEP_VERSION = "5.0.4";
     private static final int PDF_SWEEP_COPYRIGHT_SINCE = 2000;
     private static final int PDF_SWEEP_COPYRIGHT_TO = 2025;
 

src/test/java/com/itextpdf/pdfcleanup/UnsupportedImageTypeTest.java

@@ -62,10 +62,12 @@ public void checkUnSupportedImageTypeTest() throws IOException, InterruptedExcep
         Rectangle area = pdfDocument.getPage(pageIndex).getPageSize();
         workingTool.addCleanupLocation(new PdfCleanUpLocation(pageIndex, area, ColorConstants.RED));
 
-        String java_ver = System.getProperty("java.version");
-        System.out.println("Java Version: " + java_ver);
+        String javaVendor = System.getProperty("java.vendor");
+        System.out.println("Java Vendor: " + javaVendor);
+        String javaVer = System.getProperty("java.version");
+        System.out.println("Java Version: " + javaVer);
 
-        if (isFixedInJdk(java_ver)) {
+        if (isFixedInJdk(javaVer, javaVendor)) {
             workingTool.cleanUp();
             pdfDocument.close();
             compareByContent(cmp, output, OUTPUT_PATH, "diff_UnsupportedImageType_");
@@ -80,18 +82,21 @@ public void checkUnSupportedImageTypeTest() throws IOException, InterruptedExcep
 
     }
 
-    private static boolean isFixedInJdk(String versionStr) {
-        //fixed for jdk8 from 351 onwards, for jdk11 from 16 onwards and for jdk17 starting from 4
+    private static boolean isFixedInJdk(String versionStr, String vendorStr) {
+        //Fixed CMYK bug https://bugs.openjdk.org/browse/JDK-8274735 for openJDK:
+        //jdk8 from 351 onwards, for jdk11 from 16 onwards and for jdk17 starting from 4.
+        //Amazon corretto jdk started support CMYK for JPEG from 11 version.
         boolean isFixed = false;
         int majorVer = getMajorVer(versionStr);
         String[] split = versionStr.split("[._-]");
         int minorVer = Integer.parseInt(split[split.length - 1]);
 
-        if (minorVer % 10 == 2) {
-            return false;
-        }
         switch (majorVer) {
             case 8:
+                if ("Amazon.com Inc.".equals(vendorStr)) {
+                    return false;
+                }
+
                 isFixed = minorVer >= 351;
                 break;
             case 11: