Skip to content

Commit bd582da

Browse files
Revert [a69a8131fa] "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 Autoported commit. Original commit hash: [b7a901674e]
1 parent 5ec0c32 commit bd582da

File tree

5 files changed

+2
-17
lines changed

5 files changed

+2
-17
lines changed

itext.tests/itext.kernel.tests/itext/kernel/utils/CompareToolTest.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,6 @@ public virtual void CompareToolErrorReportTest04() {
133133
+ "simple_pdf.report.xml"), "CompareTool report differs from the reference one");
134134
}
135135

136-
/// <exception cref="System.Exception"/>
137-
/// <exception cref="System.IO.IOException"/>
138-
[NUnit.Framework.Test]
139-
public virtual void ImgFilterDiffTest() {
140-
CompareTool compareTool = new CompareTool();
141-
compareTool.SetGenerateCompareByContentXmlReport(true);
142-
String outPdf = sourceFolder + "imgFilterDiff.pdf";
143-
String cmpPdf = sourceFolder + "cmp_imgFilterDiff.pdf";
144-
String result = compareTool.CompareByContent(outPdf, cmpPdf, destinationFolder);
145-
// test that compareByContent doesn't fail with error
146-
System.Console.Out.WriteLine(result);
147-
NUnit.Framework.Assert.IsNotNull(result);
148-
}
149-
150136
/// <exception cref="System.IO.IOException"/>
151137
[NUnit.Framework.Test]
152138
public virtual void DifferentProducerTest() {

itext/itext.kernel/itext/kernel/utils/CompareTool.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,8 +1649,7 @@ private bool CompareObjects(PdfObject outObj, PdfObject cmpObj, CompareTool.Obje
16491649

16501650
private bool CompareStreamsExtended(PdfStream outStream, PdfStream cmpStream, CompareTool.ObjectPath currentPath
16511651
, CompareTool.CompareResult compareResult) {
1652-
bool toDecode = PdfName.FlateDecode.Equals(outStream.Get(PdfName.Filter)) && PdfName.FlateDecode.Equals(cmpStream
1653-
.Get(PdfName.Filter));
1652+
bool toDecode = PdfName.FlateDecode.Equals(outStream.Get(PdfName.Filter));
16541653
byte[] outStreamBytes = outStream.GetBytes(toDecode);
16551654
byte[] cmpStreamBytes = cmpStream.GetBytes(toDecode);
16561655
if (JavaUtil.ArraysEquals(outStreamBytes, cmpStreamBytes)) {

port-hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bff5c021deff1084c9900878ac6c85f983d82b76
1+
b7a901674e5cb6ae3c018047fdc5c80598478de2

0 commit comments

Comments
 (0)