[RELEASE] iText 7 pdfSweep - 2.0.4

https://github.com/itext/i7j-pdfsweep/releases/tag/2.0.4

* release/2.0.4:
  [RELEASE] 2.0.4-SNAPSHOT -> 2.0.4
  Implement image masks filtering
  Handle noninvertible transformation matricies. Add some tests.
  Make use of SystemUtil#getTimeBasedIntSeed() method for Random instance creation
  Improve contribution guidelines
  Remove unused imports and add @category for tests
  [RELEASE] 2.0.3-SNAPSHOT -> 2.0.4-SNAPSHOT

Author: iText-CI

CONTRIBUTING.md

@@ -70,83 +70,29 @@ Before you submit your pull request consider the following guidelines:
 * Please sign the [iText Contributor License Agreement (iCLA)](#cla) before sending pull
   requests for any change of more than 20 significant lines of code (we're not counting curly braces and other syntactical sugar).
   We cannot accept code without this agreement.
-* Clone **iText 7 Community** to your local machine.
-
-     ```shell
-     git clone git@github.com:itext/itext7.git
-     cd itext7
-     git fetch origin
-     git checkout -b develop origin/develop
-     ```
-
-* Make your changes in a new git branch based off the develop branch:
-
-     ```shell
-     git checkout -b my-fix-branch develop
-     ```
-
-* Create your patch, **including appropriate test cases**.
+* Fork the iText repository on GitHub.
+* Clone your iText fork to your local machine.
+* Make your changes, **including appropriate test cases**.
 * Follow our [Coding Rules](#rules).
-* Run the full **iText 7 Community** test suite and ensure that all tests pass.
 * Commit your changes using a descriptive commit message that follows our
   [commit message conventions](#commit-message-format).
-
-     ```shell
-     git commit -a
-     ```
-  Note: the optional commit `-a` command line option will automatically `add` and `rm` edited files.
-
 * Now would be a good time to fix up your commits (if you want or need to) with `git rebase --interactive`.
 * Build your changes locally to ensure all the tests pass.
-* Push your branch to your GitHub account:
-
-    ```shell
-    git remote add my-remote git@github.com:my-remote/itext7.git
-    git push my-remote my-fix-branch
-    ```
-
-* In GitHub, send a pull request to `itext7:develop`.
+* Push your changes to your GitHub account.
+* Create a pull request in GitHub.
+"Head fork" should be your repository, and the "base fork" should be the iText7 official repository.
 * If we suggest changes then:
   * Make the required updates.
-  * Re-run the **iText 7 Community** test suite to ensure tests are still passing.
-  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
-
-    ```shell
-    git fetch origin
-    git rebase develop -i
-    git push my-remote my-fix-branch -f
-    ```
+  * Fix up your commits if needed, with an interactive rebase.
+  * Re-run the tests and make sure that they are still passing.
+  * Force push to your GitHub repository. This will update your Pull Request.
 
 That's it! Thank you for your contribution!
 
 #### After your pull request is merged
 
-After your pull request is merged, you can safely delete your branch and pull the changes
-from the main (upstream) repository:
-
-* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
-
-    ```shell
-    git push my-remote --delete my-fix-branch
-    ```
-
-* Check out the develop branch:
-
-    ```shell
-    git checkout develop -f
-    ```
-
-* Delete the local branch:
-
-    ```shell
-    git branch -D my-fix-branch
-    ```
-
-* Update your develop with the latest upstream version:
-
-    ```shell
-    git pull --ff upstream develop
-    ```
+After your pull request is merged, you can safely delete your fork and pull the changes
+from the main (upstream) repository.
 
 
 ## <a name="rules">Coding Rules</a>

pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.5</version>
+    <version>7.1.6</version>
     <relativePath/>
   </parent>
   <artifactId>cleanup</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4</version>
   <name>pdfSweep</name>
   <url>http://itextpdf.com/</url>
   <properties>

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

@@ -46,11 +46,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfIndirectReference;
 import com.itextpdf.kernel.pdf.PdfStream;
-import com.itextpdf.kernel.pdf.canvas.parser.data.ImageRenderInfo;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -60,8 +57,8 @@ This file is part of the iText (R) project.
 class FilteredImagesCache {
     private Map<PdfIndirectReference, List<FilteredImageKey>> cache = new HashMap<>();
 
-    static FilteredImageKey createFilteredImageKey(ImageRenderInfo image, List<Rectangle> areasToBeCleaned, PdfDocument document) {
-        PdfStream imagePdfObject = image.getImage().getPdfObject();
+    static FilteredImageKey createFilteredImageKey(PdfImageXObject image, List<Rectangle> areasToBeCleaned, PdfDocument document) {
+        PdfStream imagePdfObject = image.getPdfObject();
         if (imagePdfObject.getIndirectReference() == null) {
             imagePdfObject.makeIndirect(document);
         }
@@ -125,25 +122,25 @@ private boolean rectanglesEqualWithEps(List<Rectangle> cacheRects, List<Rectangl
     }
 
     static class FilteredImageKey {
-        private ImageRenderInfo image;
+        private PdfImageXObject image;
         private List<Rectangle> cleanedAreas;
         private PdfImageXObject filteredImage;
 
-        FilteredImageKey(ImageRenderInfo imageInfo, List<Rectangle> cleanedAreas) {
-            this.image = imageInfo;
+        FilteredImageKey(PdfImageXObject image, List<Rectangle> cleanedAreas) {
+            this.image = image;
             this.cleanedAreas = cleanedAreas;
         }
 
         List<Rectangle> getCleanedAreas() {
             return cleanedAreas;
         }
 
-        ImageRenderInfo getImageRenderInfo() {
+        PdfImageXObject getImageXObject() {
             return image;
         }
 
         PdfIndirectReference getImageIndRef() {
-            return image.getImage().getPdfObject().getIndirectReference();
+            return image.getPdfObject().getIndirectReference();
         }
 
         PdfImageXObject getFilteredImage() {