Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…Core

# Conflicts:
#	src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs
  • Loading branch information
VahidN committed May 16, 2024
2 parents cb13350 + c0d42b0 commit 9c4be57
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,17 @@ public bool Tampered

internal PdfEncryption Decrypt => decrypt;

<<<<<<< HEAD

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 605 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered
public void Dispose() => Close();
=======

Check failure on line 607 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 607 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 607 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 607 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 607 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 607 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered
public void Dispose()
{
Close();

// Ensure large pdf cleaned up before continuing
_xrefObj.Clear();
}
>>>>>>> c0d42b01bf31115fc2ef6304c50e862f3276ccb5

Check failure on line 615 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 615 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 615 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / build

Merge conflict marker encountered

Check failure on line 615 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 615 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

Check failure on line 615 in src/iTextSharp.LGPLv2.Core/iTextSharp/text/pdf/PdfReader.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Merge conflict marker encountered

/// <summary>
/// Sets the viewer preferences as the sum of several constants.
Expand Down Expand Up @@ -5577,4 +5587,4 @@ private void pushPageAttributes(PdfDictionary nodePages)
_pageInh.Add(dic);
}
}
}
}

0 comments on commit 9c4be57

Please sign in to comment.