Minor fixes in CompareTool

Author: yulian-gaponenko

kernel/src/main/java/com/itextpdf/kernel/utils/CompareTool.java

@@ -65,6 +65,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.ReaderProperties;
 import com.itextpdf.kernel.pdf.annot.PdfAnnotation;
 import com.itextpdf.kernel.pdf.annot.PdfLinkAnnotation;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.xmp.PdfConst;
 import com.itextpdf.kernel.xmp.XMPConst;
 import com.itextpdf.kernel.xmp.XMPException;
@@ -852,7 +853,7 @@ private String listDiffPagesAsString(List<Integer> diffPages) {
             }
         }
         sb.append("]");
-        return diffPages.toString();
+        return sb.toString();
     }
 
     private void createIgnoredAreasPdfs(String outPath, Map<Integer, List<Rectangle>> ignoredAreas) throws IOException {
@@ -867,28 +868,17 @@ private void createIgnoredAreasPdfs(String outPath, Map<Integer, List<Rectangle>
             List<Rectangle> rectangles = entry.getValue();
 
             if (rectangles != null && !rectangles.isEmpty()) {
-                //drawing rectangles manually, because we don't want to create dependency on itextpdf.canvas module for itextpdf.kernel
-                PdfStream outStream = getPageContentStream(pdfOutDoc.getPage(pageNumber));
-                PdfStream cmpStream = getPageContentStream(pdfCmpDoc.getPage(pageNumber));
-
-                outStream.getOutputStream().writeBytes(ByteUtils.getIsoBytes("q\n"));
-                outStream.getOutputStream().writeFloats(new float[]{0.0f, 0.0f, 0.0f}).writeSpace().writeBytes(ByteUtils.getIsoBytes("rg\n"));
-                cmpStream.getOutputStream().writeBytes(ByteUtils.getIsoBytes("q\n"));
-                cmpStream.getOutputStream().writeFloats(new float[]{0.0f, 0.0f, 0.0f}).writeSpace().writeBytes(ByteUtils.getIsoBytes("rg\n"));
+                PdfCanvas outCanvas = new PdfCanvas(pdfOutDoc.getPage(pageNumber));
+                PdfCanvas cmpCanvas = new PdfCanvas(pdfCmpDoc.getPage(pageNumber));
 
+                outCanvas.saveState();
+                cmpCanvas.saveState();
                 for (Rectangle rect : rectangles) {
-                    outStream.getOutputStream().writeFloats(new float[]{rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight()}).
-                            writeSpace().
-                            writeBytes(ByteUtils.getIsoBytes("re\n")).
-                            writeBytes(ByteUtils.getIsoBytes("f\n"));
-
-                    cmpStream.getOutputStream().writeFloats(new float[]{rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight()}).
-                            writeSpace().
-                            writeBytes(ByteUtils.getIsoBytes("re\n")).
-                            writeBytes(ByteUtils.getIsoBytes("f\n"));
+                    outCanvas.rectangle(rect).fill();
+                    cmpCanvas.rectangle(rect).fill();
                 }
-                outStream.getOutputStream().writeBytes(ByteUtils.getIsoBytes("Q\n"));
-                cmpStream.getOutputStream().writeBytes(ByteUtils.getIsoBytes("Q\n"));
+                outCanvas.restoreState();
+                cmpCanvas.restoreState();
             }
         }
 
@@ -898,11 +888,6 @@ private void createIgnoredAreasPdfs(String outPath, Map<Integer, List<Rectangle>
         init(outPath + ignoredAreasPrefix + outPdfName, outPath + ignoredAreasPrefix + cmpPdfName);
     }
 
-    private PdfStream getPageContentStream(PdfPage page) {
-        PdfStream stream = page.getContentStream(page.getContentStreamCount() - 1);
-        return stream.getOutputStream() == null ? page.newContentStreamAfter() : stream;
-    }
-
     private void prepareOutputDirs(String outPath, String differenceImagePrefix) {
         File[] imageFiles;
         File[] cmpImageFiles;