From 091aa736691979aa3e0b307cdb9a940518d0d60a Mon Sep 17 00:00:00 2001 From: Marco Accardi Date: Tue, 21 Apr 2020 11:11:20 +0200 Subject: [PATCH 1/6] ignore update --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 72fc850..bf0bf37 100644 --- a/.gitignore +++ b/.gitignore @@ -122,4 +122,5 @@ reise_bestand_ws_war/overlays # Gradle build/ -*.pdf \ No newline at end of file +*.pdf +output/ From d1fe8e71449b84cd7bbec1d319edfc054ddcba1e Mon Sep 17 00:00:00 2001 From: Marco Accardi Date: Tue, 21 Apr 2020 16:17:49 +0200 Subject: [PATCH 2/6] added horizontal compare feature --- .../redsix/pdfcompare/CompareResultImpl.java | 58 ++++++++++++++----- .../redsix/pdfcompare/ImageWithDimension.java | 4 ++ .../de/redsix/pdfcompare/ResultCollector.java | 4 ++ .../pdfcompare/env/ConfigFileEnvironment.java | 5 ++ .../de/redsix/pdfcompare/env/Environment.java | 2 + .../pdfcompare/env/SimpleEnvironment.java | 14 +++++ src/main/java/x/team/poc/POC.java | 33 +++++++++++ src/main/java/x/team/tool/MergeImages.java | 39 +++++++++++++ 8 files changed, 145 insertions(+), 14 deletions(-) create mode 100644 src/main/java/x/team/poc/POC.java create mode 100644 src/main/java/x/team/tool/MergeImages.java diff --git a/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java b/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java index a3fec06..b0ace5a 100644 --- a/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java +++ b/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java @@ -16,6 +16,8 @@ package de.redsix.pdfcompare; import de.redsix.pdfcompare.env.Environment; +import x.team.tool.MergeImages; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -120,20 +122,25 @@ protected boolean keepImages() { } @Override - public synchronized void addPage(final PageDiffCalculator diffCalculator, final int pageIndex, - final ImageWithDimension expectedImage, final ImageWithDimension actualImage, final ImageWithDimension diffImage) { - Objects.requireNonNull(expectedImage, "expectedImage is null"); - Objects.requireNonNull(actualImage, "actualImage is null"); - Objects.requireNonNull(diffImage, "diffImage is null"); - this.hasDifferenceInExclusion |= diffCalculator.differencesFoundInExclusion(); - if (diffCalculator.differencesFound()) { - isEqual = false; - diffAreas.add(diffCalculator.getDiffArea()); - diffImages.put(pageIndex, diffImage); - pages++; - } else if (environment.addEqualPagesToResult()) { - diffImages.put(pageIndex, diffImage); - pages++; + public synchronized void addPage(final PageDiffCalculator diffCalculator, final int pageIndex,final ImageWithDimension expectedImage, final ImageWithDimension actualImage, final ImageWithDimension diffImage) { + if(this.environment.getEnableHorizontalCompareOutput()) { + System.out.println("devo chiamare mio addpage"); + this.addPageWithHorizontalCompare(diffCalculator, pageIndex, expectedImage, actualImage, diffImage); + }else { + Objects.requireNonNull(expectedImage, "expectedImage is null"); + Objects.requireNonNull(actualImage, "actualImage is null"); + Objects.requireNonNull(diffImage, "diffImage is null"); + + this.hasDifferenceInExclusion |= diffCalculator.differencesFoundInExclusion(); + if (diffCalculator.differencesFound()) { + isEqual = false; + diffAreas.add(diffCalculator.getDiffArea()); + diffImages.put(pageIndex, diffImage); + pages++; + } else if (environment.addEqualPagesToResult()) { + diffImages.put(pageIndex, diffImage); + pages++; + } } } @@ -199,4 +206,27 @@ public void actualOnly() { public void setEnvironment(Environment environment) { this.environment = environment; } + + @Override + public void addPageWithHorizontalCompare(PageDiffCalculator diffCalculator, int pageIndex, + ImageWithDimension expectedImage, ImageWithDimension actualImage, ImageWithDimension diffImage) { + + Objects.requireNonNull(expectedImage, "expectedImage is null"); + Objects.requireNonNull(actualImage, "actualImage is null"); + Objects.requireNonNull(diffImage, "diffImage is null"); + this.hasDifferenceInExclusion |= diffCalculator.differencesFoundInExclusion(); + + //Creto una nuova immagine con a sinistra l'atteso e a destra l'attuale con segnate le differenze + MergeImages merge=new MergeImages(); + ImageWithDimension mergedImage=merge.mergeOnLeft(expectedImage, diffImage); + if (diffCalculator.differencesFound()) { + isEqual = false; + diffAreas.add(diffCalculator.getDiffArea()); + diffImages.put(pageIndex, mergedImage); + pages++; + } else if (environment.addEqualPagesToResult()) { + diffImages.put(pageIndex, mergedImage); + pages++; + } + } } diff --git a/src/main/java/de/redsix/pdfcompare/ImageWithDimension.java b/src/main/java/de/redsix/pdfcompare/ImageWithDimension.java index 153f0f7..744f01b 100644 --- a/src/main/java/de/redsix/pdfcompare/ImageWithDimension.java +++ b/src/main/java/de/redsix/pdfcompare/ImageWithDimension.java @@ -15,4 +15,8 @@ public ImageWithDimension(final BufferedImage bufferedImage, final float width, this.width = width; this.height = height; } + + public BufferedImage getBufferedImage() { + return bufferedImage; + } } diff --git a/src/main/java/de/redsix/pdfcompare/ResultCollector.java b/src/main/java/de/redsix/pdfcompare/ResultCollector.java index 85970f1..1a157bf 100644 --- a/src/main/java/de/redsix/pdfcompare/ResultCollector.java +++ b/src/main/java/de/redsix/pdfcompare/ResultCollector.java @@ -5,6 +5,10 @@ public interface ResultCollector { void addPage(PageDiffCalculator diffCalculator, int pageIndex, ImageWithDimension expectedImage, ImageWithDimension actualImage, ImageWithDimension diffImage); + void addPageWithHorizontalCompare(PageDiffCalculator diffCalculator, int pageIndex, + ImageWithDimension expectedImage, ImageWithDimension actualImage, ImageWithDimension diffImage); + + void noPagesFound(); default void done() {} diff --git a/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java b/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java index bbc334d..0cc79f2 100644 --- a/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java +++ b/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java @@ -135,4 +135,9 @@ public boolean failOnMissingIgnoreFile() { private int getMB(final String path) { return config.getInt(path) * 1024 * 1024; } + + @Override + public boolean getEnableHorizontalCompareOutput() { + return false; + } } diff --git a/src/main/java/de/redsix/pdfcompare/env/Environment.java b/src/main/java/de/redsix/pdfcompare/env/Environment.java index c039e0c..88a023e 100644 --- a/src/main/java/de/redsix/pdfcompare/env/Environment.java +++ b/src/main/java/de/redsix/pdfcompare/env/Environment.java @@ -32,4 +32,6 @@ public interface Environment { boolean addEqualPagesToResult(); boolean failOnMissingIgnoreFile(); + + boolean getEnableHorizontalCompareOutput(); } diff --git a/src/main/java/de/redsix/pdfcompare/env/SimpleEnvironment.java b/src/main/java/de/redsix/pdfcompare/env/SimpleEnvironment.java index 0291fac..1d03449 100644 --- a/src/main/java/de/redsix/pdfcompare/env/SimpleEnvironment.java +++ b/src/main/java/de/redsix/pdfcompare/env/SimpleEnvironment.java @@ -37,6 +37,7 @@ public class SimpleEnvironment implements Environment { private Integer dpi; private Boolean addEqualPagesToResult; private Boolean failOnMissingIgnoreFile; + private Boolean enableHorizontalCompareOutput=false; public SimpleEnvironment() { this(DefaultEnvironment.create()); @@ -186,4 +187,17 @@ public SimpleEnvironment setFailOnMissingIgnoreFile(final boolean b) { this.failOnMissingIgnoreFile = b; return this; } + + public SimpleEnvironment setEnableHorizontalCompareOutput(Boolean enableHorizontalCompareOutput) { + this.enableHorizontalCompareOutput = enableHorizontalCompareOutput; + return this; + } + + public boolean getEnableHorizontalCompareOutput() { + return enableHorizontalCompareOutput; + } + + + + } diff --git a/src/main/java/x/team/poc/POC.java b/src/main/java/x/team/poc/POC.java new file mode 100644 index 0000000..dc70495 --- /dev/null +++ b/src/main/java/x/team/poc/POC.java @@ -0,0 +1,33 @@ +package x.team.poc; + +import java.awt.Color; + +import de.redsix.pdfcompare.CompareResult; +import de.redsix.pdfcompare.PdfComparator; +import de.redsix.pdfcompare.env.SimpleEnvironment; + +public class POC { + + public static void main(String[] args) { + try { + + PdfComparator compare = new PdfComparator("input/expected.pdf", "input/actual.pdf") + .withEnvironment(new SimpleEnvironment().setActualColor(Color.red) + .setExpectedColor(Color.white).setAddEqualPagesToResult(true) + .setEnableHorizontalCompareOutput(true)); + + CompareResult result = compare.compare(); + result .writeTo("output/diffOutput"); + if (result.isNotEqual()) { + System.out.println("Ho trovato differenza!"); + } + if (result.isEqual()) { + System.out.println("Non ho trovato nessuna differenza!"); + } + result.getDifferences(); + } catch (Exception e) { + e.printStackTrace(); + } + } + +} diff --git a/src/main/java/x/team/tool/MergeImages.java b/src/main/java/x/team/tool/MergeImages.java new file mode 100644 index 0000000..ff58d47 --- /dev/null +++ b/src/main/java/x/team/tool/MergeImages.java @@ -0,0 +1,39 @@ +package x.team.tool; + +import java.awt.Graphics; +import java.awt.image.BufferedImage; +import java.io.File; + +import javax.imageio.ImageIO; + +import de.redsix.pdfcompare.ImageWithDimension; + +public class MergeImages { + + public ImageWithDimension mergeOnLeft(ImageWithDimension left, ImageWithDimension right) { + BufferedImage newImage = null; + ImageWithDimension nuovaImmag =null; + try { + //ImageIO.write(left.getBufferedImage(), "PNG", new File("output/left.png")); + //ImageIO.write(right.getBufferedImage(), "PNG", new File("output/right.png")); + + float totalWidth = left.getBufferedImage().getWidth() + right.getBufferedImage().getWidth(); + float maxHeight = Math.max(left.getBufferedImage().getHeight(), right.getBufferedImage().getHeight()); + + //System.out.println("totalWidth:" + totalWidth); + //System.out.println("maxHeight:" + maxHeight); + BufferedImage combined = new BufferedImage(Math.round(totalWidth), Math.round(maxHeight),BufferedImage.TYPE_INT_ARGB); + + Graphics g = combined.getGraphics(); + g.drawImage(left.getBufferedImage(), 0, 0, null); + g.drawImage(right.getBufferedImage(), Math.round(left.getBufferedImage().getWidth()), 0, null); + //ImageIO.write(combined, "PNG", new File("output/comb.png")); + g.dispose(); + nuovaImmag = new ImageWithDimension(combined, combined.getWidth(), combined.getHeight()); + //ImageIO.write(nuovaImmag.getBufferedImage(), "PNG", new File("output/combfinal.png")); + } catch (Exception e) { + e.printStackTrace(); + } + return (nuovaImmag); + } +} From 382e1eb7b06b1878777cf3a6fa3ae471c6a56213 Mon Sep 17 00:00:00 2001 From: Marco Accardi Date: Tue, 21 Apr 2020 16:33:25 +0200 Subject: [PATCH 3/6] removed useless log --- src/main/java/de/redsix/pdfcompare/CompareResultImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java b/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java index b0ace5a..775fb1b 100644 --- a/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java +++ b/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java @@ -124,7 +124,6 @@ protected boolean keepImages() { @Override public synchronized void addPage(final PageDiffCalculator diffCalculator, final int pageIndex,final ImageWithDimension expectedImage, final ImageWithDimension actualImage, final ImageWithDimension diffImage) { if(this.environment.getEnableHorizontalCompareOutput()) { - System.out.println("devo chiamare mio addpage"); this.addPageWithHorizontalCompare(diffCalculator, pageIndex, expectedImage, actualImage, diffImage); }else { Objects.requireNonNull(expectedImage, "expectedImage is null"); From 591195abc9238df9ebba1e75cfce81c7523762ca Mon Sep 17 00:00:00 2001 From: Marco Accardi Date: Fri, 12 Mar 2021 12:53:28 +0100 Subject: [PATCH 4/6] fix --- .../de/redsix/pdfcompare/PdfComparator.java | 4 +- .../pdfcompare/env/ConfigFileEnvironment.java | 4 +- src/main/java/x/team/tool/MergeImages.java | 44 ++++++++++++++----- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/redsix/pdfcompare/PdfComparator.java b/src/main/java/de/redsix/pdfcompare/PdfComparator.java index 39bbf2e..5bc19b5 100644 --- a/src/main/java/de/redsix/pdfcompare/PdfComparator.java +++ b/src/main/java/de/redsix/pdfcompare/PdfComparator.java @@ -61,7 +61,9 @@ public class PdfComparator { private final TimeUnit unit = TimeUnit.MINUTES; private String expectedPassword = ""; private String actualPassword = ""; - private boolean withIgnoreCalled = false; + private boolean withIgnoreCalled = false; + public static String headerLeft=""; + public static String headerRight=""; /** * Compare two PDFs, that are given as base64 encoded strings. diff --git a/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java b/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java index 0cc79f2..6d8763a 100644 --- a/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java +++ b/src/main/java/de/redsix/pdfcompare/env/ConfigFileEnvironment.java @@ -51,7 +51,9 @@ public Path getTempDirectory() { @Override public int getNrOfImagesToCache() { - return config.getInt("imageCacheSizeCount"); + return(0); + //return config.getInt("imageCacheSizeCount"); + } @Override diff --git a/src/main/java/x/team/tool/MergeImages.java b/src/main/java/x/team/tool/MergeImages.java index ff58d47..975c226 100644 --- a/src/main/java/x/team/tool/MergeImages.java +++ b/src/main/java/x/team/tool/MergeImages.java @@ -1,5 +1,7 @@ package x.team.tool; +import java.awt.Color; +import java.awt.Font; import java.awt.Graphics; import java.awt.image.BufferedImage; import java.io.File; @@ -10,27 +12,47 @@ public class MergeImages { - public ImageWithDimension mergeOnLeft(ImageWithDimension left, ImageWithDimension right) { + public ImageWithDimension mergeOnLeft(ImageWithDimension left, ImageWithDimension right, String headerLeft, + String headerRight) { BufferedImage newImage = null; - ImageWithDimension nuovaImmag =null; + ImageWithDimension nuovaImmag = null; try { - //ImageIO.write(left.getBufferedImage(), "PNG", new File("output/left.png")); - //ImageIO.write(right.getBufferedImage(), "PNG", new File("output/right.png")); - + ImageIO.write(left.getBufferedImage(), "PNG", new File("left.png")); + ImageIO.write(right.getBufferedImage(), "PNG", new File("right.png")); + float totalWidth = left.getBufferedImage().getWidth() + right.getBufferedImage().getWidth(); float maxHeight = Math.max(left.getBufferedImage().getHeight(), right.getBufferedImage().getHeight()); - - //System.out.println("totalWidth:" + totalWidth); - //System.out.println("maxHeight:" + maxHeight); - BufferedImage combined = new BufferedImage(Math.round(totalWidth), Math.round(maxHeight),BufferedImage.TYPE_INT_ARGB); + // System.out.println("totalWidth:" + totalWidth); + // System.out.println("maxHeight:" + maxHeight); + BufferedImage combined = new BufferedImage(Math.round(totalWidth), Math.round(maxHeight), + BufferedImage.TYPE_INT_ARGB); Graphics g = combined.getGraphics(); + + if (headerLeft != null && !headerLeft.isEmpty()) { + Graphics leftG = left.getBufferedImage().getGraphics(); + leftG.setColor(Color.black); + int fontSize = 50; + leftG.setFont(new Font(g.getFont().getFontName(), Font.BOLD, 50)); + leftG.drawString(headerLeft, Math.round(left.getBufferedImage().getWidth() / 2), fontSize); + } + if (headerRight != null && !headerRight.isEmpty()) { + Graphics rightG = right.getBufferedImage().getGraphics(); + rightG.setColor(Color.black); + int fontSize = 50; + rightG.setFont(new Font(g.getFont().getFontName(), Font.BOLD, 50)); + rightG.drawString(headerRight, Math.round(right.getBufferedImage().getWidth() / 2), fontSize); + + } + + //ImageIO.write(left.getBufferedImage(), "PNG", new File("left.png")); g.drawImage(left.getBufferedImage(), 0, 0, null); g.drawImage(right.getBufferedImage(), Math.round(left.getBufferedImage().getWidth()), 0, null); - //ImageIO.write(combined, "PNG", new File("output/comb.png")); + ImageIO.write(combined, "PNG", new File("comb.png")); g.dispose(); nuovaImmag = new ImageWithDimension(combined, combined.getWidth(), combined.getHeight()); - //ImageIO.write(nuovaImmag.getBufferedImage(), "PNG", new File("output/combfinal.png")); + // ImageIO.write(nuovaImmag.getBufferedImage(), "PNG", new + // File("output/combfinal.png")); } catch (Exception e) { e.printStackTrace(); } From c48d1c64979b845a9fc1d1e960779583c716f7aa Mon Sep 17 00:00:00 2001 From: Marco Accardi Date: Fri, 12 Mar 2021 12:58:11 +0100 Subject: [PATCH 5/6] fix evo --- .../AbstractCompareResultWithSwap.java | 10 +-- .../redsix/pdfcompare/CompareResultImpl.java | 8 +- .../java/de/redsix/pdfcompare/DiffImage.java | 82 ++++++++++++++++++- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/redsix/pdfcompare/AbstractCompareResultWithSwap.java b/src/main/java/de/redsix/pdfcompare/AbstractCompareResultWithSwap.java index c87cf13..909cbdf 100644 --- a/src/main/java/de/redsix/pdfcompare/AbstractCompareResultWithSwap.java +++ b/src/main/java/de/redsix/pdfcompare/AbstractCompareResultWithSwap.java @@ -59,14 +59,14 @@ private boolean writeTo(final PDFMergerUtility mergerUtility) { swapToDisk(); Utilities.shutdownAndAwaitTermination(swapExecutor, "Swap"); try { - LOG.trace("Merging..."); + LOG.info("Merging..."); Instant start = Instant.now(); for (Path path : FileUtils.getPaths(getTempDir(), "partial_*")) { mergerUtility.addSource(path.toFile()); } mergerUtility.mergeDocuments(Utilities.getMemorySettings(environment.getMergeCacheSize())); Instant end = Instant.now(); - LOG.trace("Merging took: " + Duration.between(start, end).toMillis() + "ms"); + LOG.info("Merging took: " + Duration.between(start, end).toMillis() + "ms"); } catch (IOException e) { throw new RuntimeException(e); } finally { @@ -116,11 +116,11 @@ private synchronized void swapToDisk() { if (!images.isEmpty()) { swapped = true; getExecutor(environment).execute(() -> { - LOG.trace("Swapping {} pages to disk", images.size()); + LOG.info("Swapping {} pages to disk", images.size()); Instant start = Instant.now(); final int minPageIndex = images.keySet().iterator().next(); - LOG.trace("minPageIndex: {}", minPageIndex); + LOG.info("minPageIndex: {}", minPageIndex); try (PDDocument document = new PDDocument(Utilities.getMemorySettings(environment.getSwapCacheSize()))) { document.setResourceCache(new ResourceCacheWithLimitedImages(environment)); addImagesToDocument(document, images); @@ -131,7 +131,7 @@ private synchronized void swapToDisk() { throw new RuntimeException(e); } Instant end = Instant.now(); - LOG.trace("Swapping took: {}ms", Duration.between(start, end).toMillis()); + LOG.info("Swapping took: {}ms", Duration.between(start, end).toMillis()); }); } } diff --git a/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java b/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java index 775fb1b..09f77a1 100644 --- a/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java +++ b/src/main/java/de/redsix/pdfcompare/CompareResultImpl.java @@ -217,7 +217,13 @@ public void addPageWithHorizontalCompare(PageDiffCalculator diffCalculator, int //Creto una nuova immagine con a sinistra l'atteso e a destra l'attuale con segnate le differenze MergeImages merge=new MergeImages(); - ImageWithDimension mergedImage=merge.mergeOnLeft(expectedImage, diffImage); + ImageWithDimension mergedImage=null; + if(pageIndex==0) { + mergedImage=merge.mergeOnLeft(expectedImage, diffImage,PdfComparator.headerLeft,PdfComparator.headerRight); + }else { + mergedImage=merge.mergeOnLeft(expectedImage, diffImage,null,null); + } + if (diffCalculator.differencesFound()) { isEqual = false; diffAreas.add(diffCalculator.getDiffArea()); diff --git a/src/main/java/de/redsix/pdfcompare/DiffImage.java b/src/main/java/de/redsix/pdfcompare/DiffImage.java index 370eca2..836400f 100644 --- a/src/main/java/de/redsix/pdfcompare/DiffImage.java +++ b/src/main/java/de/redsix/pdfcompare/DiffImage.java @@ -5,11 +5,19 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.DataBuffer; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import de.redsix.pdfcompare.env.Environment; +import jdk.internal.org.jline.utils.Log; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.sun.org.apache.xalan.internal.xsltc.compiler.sym; + public class DiffImage { private static final Logger LOG = LoggerFactory.getLogger(DiffImage.class); @@ -47,6 +55,9 @@ public BufferedImage getImage() { } public void diffImages() { + + System.out.println("TEST JVM 1"); + BufferedImage expectBuffImage = this.expectedImage.bufferedImage; BufferedImage actualBuffImage = this.actualImage.bufferedImage; expectedBuffer = expectBuffImage.getRaster().getDataBuffer(); @@ -73,8 +84,9 @@ public void diffImages() { final int actualLineOffset = y * actualImageWidth; final int resultLineOffset = y * resultImageWidth; for (int x = 0; x < resultImageWidth; x++) { - expectedElement = getExpectedElement(x, y, expectedLineOffset); + expectedElement = getExpectedElement(x, y, expectedLineOffset); actualElement = getActualElement(x, y, actualLineOffset); + //this.salvaSuFileImmagine(actualBuffer, expectedBuffer); int element = getElement(expectedElement, actualElement); if (pageExclusions.contains(x, y)) { element = ImageTools.fadeExclusion(element); @@ -85,7 +97,7 @@ public void diffImages() { if (expectedElement != actualElement) { extendDiffArea(x, y); diffCalculator.diffFound(); - LOG.trace("Difference found on page: {} at x: {}, y: {}", page + 1, x, y); + LOG.debug("Difference found on page: {} at x: {}, y: {}", page + 1, x, y); mark(resultBuffer, x, y, resultImageWidth, MARKER_RGB); } } @@ -94,7 +106,7 @@ public void diffImages() { } if (diffCalculator.differencesFound()) { diffCalculator.addDiffArea(new PageArea(page + 1, diffAreaX1, diffAreaY1, diffAreaX2, diffAreaY2)); - LOG.info("Differences found at { page: {}, x1: {}, y1: {}, x2: {}, y2: {} }", page + 1, diffAreaX1, diffAreaY1, diffAreaX2, + LOG.debug("Differences found at { page: {}, x1: {}, y1: {}, x2: {}, y2: {} }", page + 1, diffAreaX1, diffAreaY1, diffAreaX2, diffAreaY2); } final float maxWidth = Math.max(expectedImage.width, actualImage.width); @@ -102,7 +114,69 @@ public void diffImages() { compareResult.addPage(diffCalculator, page, expectedImage, actualImage, new ImageWithDimension(resultImage, maxWidth, maxHeight)); } - private void extendDiffArea(final int x, final int y) { + private void salvaSuFileImmagine(DataBuffer actualBuffer2, DataBuffer expectedBuffer2) { + System.out.println("********************* DATA BUFFER ACTUAL ******************************"); + String actualBuffer=""; + System.out.println("Inizio a leggere actualbuffer..."); + int value=0; + for(int i=0;i Date: Fri, 12 Mar 2021 12:58:49 +0100 Subject: [PATCH 6/6] fix --- src/main/java/de/redsix/pdfcompare/DiffImage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/redsix/pdfcompare/DiffImage.java b/src/main/java/de/redsix/pdfcompare/DiffImage.java index 836400f..04af730 100644 --- a/src/main/java/de/redsix/pdfcompare/DiffImage.java +++ b/src/main/java/de/redsix/pdfcompare/DiffImage.java @@ -11,7 +11,7 @@ import java.io.IOException; import de.redsix.pdfcompare.env.Environment; -import jdk.internal.org.jline.utils.Log; + import org.slf4j.Logger; import org.slf4j.LoggerFactory;