Merge pull request #215 from delta-emil/expose-PdfReadAccuracy-through-XPdfForm

expose PdfReadAccuracy through XPdfForm

Author: ststeiger

PdfSharpCore/Drawing/XImage.cs

@@ -33,6 +33,7 @@
 using PdfSharpCore.Pdf.IO;
 using PdfSharpCore.Pdf.Advanced;
 using MigraDocCore.DocumentObjectModel.MigraDoc.DocumentObjectModel.Shapes;
+using PdfSharpCore.Pdf.IO.enums;
 using static MigraDocCore.DocumentObjectModel.MigraDoc.DocumentObjectModel.Shapes.ImageSource;
 using PdfSharpCore.Utils;
 using SixLabors.ImageSharp.PixelFormats;
@@ -118,9 +119,21 @@ protected XImage()
         /// </summary>
         /// <param name="path">The path to a BMP, PNG, GIF, JPEG, TIFF, or PDF file.</param>
         public static XImage FromFile(string path)
+        {
+            return FromFile(path, PdfReadAccuracy.Strict);
+        }
+
+        /// <summary>
+        /// Creates an image from the specified file.
+        /// For non-pdf files, this requires that an instance of an implementation of <see cref="T:MigraDocCore.DocumentObjectModel.MigraDoc.DocumentObjectModel.Shapes.ImageSource"/> be set on the `ImageSource.ImageSourceImpl` property.
+        /// For .NetCore apps, if this property is null at this point, then <see cref="T:PdfSharpCore.Utils.ImageSharpImageSource"/> with <see cref="T:SixLabors.ImageSharp.PixelFormats.Rgba32"/> Pixel Type is used
+        /// </summary>
+        /// <param name="path">The path to a BMP, PNG, GIF, JPEG, TIFF, or PDF file.</param>
+        /// <param name="accuracy">Moderate allows for broken references when using a PDF file.</param>
+        public static XImage FromFile(string path, PdfReadAccuracy accuracy)
         {
             if (PdfReader.TestPdfFile(path) > 0)
-                return new XPdfForm(path);
+                return new XPdfForm(path, accuracy);
             return new XImage(path);
         }
 

PdfSharpCore/Drawing/XPdfForm.cs

@@ -40,6 +40,7 @@
 using PdfSharpCore.Internal;
 using PdfSharpCore.Pdf;
 using PdfSharpCore.Pdf.IO;
+using PdfSharpCore.Pdf.IO.enums;
 
 namespace PdfSharpCore.Drawing
 {
@@ -59,7 +60,7 @@ public class XPdfForm : XForm
         /// document. Furthermore, because XPdfForm can occupy very much memory, it is recommended to
         /// dispose XPdfForm objects if not needed anymore.
         /// </summary>
-        internal XPdfForm(string path)
+        internal XPdfForm(string path, PdfReadAccuracy accuracy)
         {
             int pageNumber;
             path = ExtractPageNumber(path, out pageNumber);
@@ -74,6 +75,7 @@ internal XPdfForm(string path)
                 throw new ArgumentException("The specified file has no valid PDF file header.", "path");
 
             _path = path;
+            _pathReadAccuracy = accuracy;
             if (pageNumber != 0)
                 PageNumber = pageNumber;
         }
@@ -82,54 +84,79 @@ internal XPdfForm(string path)
         /// Initializes a new instance of the <see cref="XPdfForm"/> class from a stream.
         /// </summary>
         /// <param name="stream">The stream.</param>
-        internal XPdfForm(Stream stream)
+        /// <param name="accuracy">Moderate allows for broken references.</param>
+        internal XPdfForm(Stream stream, PdfReadAccuracy accuracy)
         {
             // Create a dummy unique path
             _path = "*" + Guid.NewGuid().ToString("B");
 
             if (PdfReader.TestPdfFile(stream) == 0)
                 throw new ArgumentException("The specified stream has no valid PDF file header.", "stream");
 
-            _externalDocument = PdfReader.Open(stream);
+            _externalDocument = PdfReader.Open(stream, accuracy);
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="XPdfForm"/> class from a stream and password.
         /// </summary>
         /// <param name="stream">The stream.</param>
         /// <param name="password">The password.</param>
-        internal XPdfForm(Stream stream, string password) {
+        /// <param name="accuracy">Moderate allows for broken references.</param>
+        internal XPdfForm(Stream stream, string password, PdfReadAccuracy accuracy) {
             // Create a dummy unique path
             _path = "*" + Guid.NewGuid().ToString("B");
 
             if (PdfReader.TestPdfFile(stream) == 0)
                 throw new ArgumentException("The specified stream has no valid PDF file header.", "stream");
 
-            _externalDocument = PdfReader.Open(stream, password, PdfDocumentOpenMode.ReadOnly);
+            _externalDocument = PdfReader.Open(stream, password, PdfDocumentOpenMode.ReadOnly, accuracy);
         }
 
         /// <summary>
         /// Creates an XPdfForm from a file.
         /// </summary>
         public static new XPdfForm FromFile(string path)
+        {
+            return FromFile(path, PdfReadAccuracy.Strict);
+        }
+
+        /// <summary>
+        /// Creates an XPdfForm from a file.
+        /// </summary>
+        public static new XPdfForm FromFile(string path, PdfReadAccuracy accuracy)
         {
             // TODO: Same file should return same object (that's why the function is static).
-            return new XPdfForm(path);
+            return new XPdfForm(path, accuracy);
         }
 
         /// <summary>
         /// Creates an XPdfForm from a stream.
         /// </summary>
         public static XPdfForm FromStream(Stream stream)
         {
-            return new XPdfForm(stream);
+            return FromStream(stream, PdfReadAccuracy.Strict);
+        }
+
+        /// <summary>
+        /// Creates an XPdfForm from a stream.
+        /// </summary>
+        public static XPdfForm FromStream(Stream stream, PdfReadAccuracy accuracy)
+        {
+            return new XPdfForm(stream, accuracy);
         }
 
         /// <summary>
         /// Creates an XPdfForm from a stream and a password.
         /// </summary>
         public static XPdfForm FromStream(Stream stream, string password) {
-            return new XPdfForm(stream, password);
+            return FromStream(stream, password, PdfReadAccuracy.Strict);
+        }
+
+        /// <summary>
+        /// Creates an XPdfForm from a stream and a password.
+        /// </summary>
+        public static XPdfForm FromStream(Stream stream, string password, PdfReadAccuracy accuracy) {
+            return new XPdfForm(stream, password, accuracy);
         }
 
         /*
@@ -370,12 +397,14 @@ internal PdfDocument ExternalDocument
                     throw new InvalidOperationException("This XPdfForm is a template and not an imported PDF page; therefore it has no external document.");
 
                 if (_externalDocument == null)
-                    _externalDocument = PdfDocument.Tls.GetDocument(_path);
+                    _externalDocument = PdfDocument.Tls.GetDocument(_path, _pathReadAccuracy);
                 return _externalDocument;
             }
         }
         internal PdfDocument _externalDocument;
 
+        private PdfReadAccuracy _pathReadAccuracy;
+
         /// <summary>
         /// Extracts the page number if the path has the form 'MyFile.pdf#123' and returns
         /// the actual path without the number sign and the following digits.

PdfSharpCore/Pdf.Internal/ThreadLocalStorage.cs

@@ -32,6 +32,7 @@
 using System.Diagnostics;
 using System.IO;
 using PdfSharpCore.Pdf.IO;
+using PdfSharpCore.Pdf.IO.enums;
 
 namespace PdfSharpCore.Pdf.Internal
 {
@@ -55,7 +56,7 @@ public void RemoveDocument(string path)
             _importedDocuments.Remove(path);
         }
 
-        public PdfDocument GetDocument(string path)
+        public PdfDocument GetDocument(string path, PdfReadAccuracy accuracy)
         {
             Debug.Assert(path.StartsWith("*") || Path.IsPathRooted(path), "Path must be full qualified.");
 
@@ -69,7 +70,7 @@ public PdfDocument GetDocument(string path)
             }
             if (document == null)
             {
-                document = PdfReader.Open(path, PdfDocumentOpenMode.Import);
+                document = PdfReader.Open(path, PdfDocumentOpenMode.Import, accuracy);
                 _importedDocuments.Add(path, document.Handle);
             }
             return document;