Skip to content

Commit b7a9016

Browse files
Revert [a69a813] "Fix bug in CompareTool when pdfstream from output file has filter different from cmp file"
Comparison of encoded streams has more problems and this fix wasn't covering all of them, in fact it revealed them and caused more test failures. ITXT-CR-749
1 parent bff5c02 commit b7a9016

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,7 @@ private boolean compareObjects(PdfObject outObj, PdfObject cmpObj, ObjectPath cu
14481448
}
14491449

14501450
private boolean compareStreamsExtended(PdfStream outStream, PdfStream cmpStream, ObjectPath currentPath, CompareResult compareResult) {
1451-
boolean toDecode = PdfName.FlateDecode.equals(outStream.get(PdfName.Filter)) && PdfName.FlateDecode.equals(cmpStream.get(PdfName.Filter));
1451+
boolean toDecode = PdfName.FlateDecode.equals(outStream.get(PdfName.Filter));
14521452
byte[] outStreamBytes = outStream.getBytes(toDecode);
14531453
byte[] cmpStreamBytes = cmpStream.getBytes(toDecode);
14541454
if (Arrays.equals(outStreamBytes, cmpStreamBytes)) {

kernel/src/test/java/com/itextpdf/kernel/utils/CompareToolTest.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,6 @@ public void compareToolErrorReportTest04() throws InterruptedException, IOExcept
123123

124124
}
125125

126-
127-
@Test
128-
public void imgFilterDiffTest() throws InterruptedException, IOException {
129-
CompareTool compareTool = new CompareTool();
130-
compareTool.setGenerateCompareByContentXmlReport(true);
131-
String outPdf = sourceFolder + "imgFilterDiff.pdf";
132-
String cmpPdf = sourceFolder + "cmp_imgFilterDiff.pdf";
133-
String result = compareTool.compareByContent(outPdf, cmpPdf, destinationFolder);
134-
// test that compareByContent doesn't fail with error
135-
System.out.println(result);
136-
Assert.assertNotNull(result);
137-
}
138-
139126
@Test
140127
public void differentProducerTest() throws IOException {
141128
String expectedMessage = "Document info fail. Expected: \"iText\u00ae <version> \u00a9<copyright years> iText Group NV (iText Software; licensed version)\", actual: \"iText\u00ae <version> \u00a9<copyright years> iText Group NV (AGPL-version)\"";

0 commit comments

Comments
 (0)