Merge pull request #15 from synercoder/fix-pdfwriter-always-disposes-stream

Fix pdfwriter always disposes stream

Author: synercoder

src/Synercoding.FileFormats.Pdf/PdfWriter.cs

@@ -12,6 +12,7 @@ namespace Synercoding.FileFormats.Pdf
     /// </summary>
     public class PdfWriter : IDisposable
     {
+        private readonly bool _ownsStream;
         private readonly Stream _stream;
         private readonly TableBuilder _tableBuilder = new TableBuilder();
 
@@ -25,12 +26,23 @@ public class PdfWriter : IDisposable
         /// </summary>
         /// <param name="stream">The <see cref="Stream"/> to write the PDF file</param>
         public PdfWriter(Stream stream)
+            : this(stream, true)
+        { }
+
+        /// <summary>
+        /// Constructor for <see cref="PdfWriter"/>
+        /// </summary>
+        /// <param name="stream">The <see cref="Stream"/> to write the PDF file</param>
+        /// <param name="ownsStream">If the stream is owned, then when this <see cref="PdfWriter"/> is disposed, the stream is also disposed.</param>
+        public PdfWriter(Stream stream, bool ownsStream)
         {
             _stream = stream;
             (new Header()).WriteToStream(stream);
 
             _pageTreeNode = _tableBuilder.ReserveId();
             _catalog = _tableBuilder.ReserveId();
+
+            _ownsStream = ownsStream;
         }
 
         /// <summary>
@@ -66,12 +78,15 @@ public void Dispose()
 
             _stream.Flush();
 
-            _stream.Dispose();
+            if (_ownsStream)
+            {
+                _stream.Dispose();
+            }
         }
 
         private void _writePageTree()
         {
-            _tableBuilder.SetPosition(_pageTreeNode,  (uint)_stream.Position);
+            _tableBuilder.SetPosition(_pageTreeNode, (uint)_stream.Position);
 
             var tree = new PageTree(_pageTreeNode, _pageReferences);
             tree.WriteToStream(_stream);
@@ -87,13 +102,13 @@ private void _writeCatalog()
 
         private void _writePdfEnding()
         {
-            if(!_tableBuilder.Validate())
+            if (!_tableBuilder.Validate())
             {
                 throw new InvalidOperationException("XRef table is invalid.");
             }
 
             var xRefTable = _tableBuilder.GetXRefTable();
-            var xRefPosition = xRefTable.WriteToStream(_stream);
+            uint xRefPosition = xRefTable.WriteToStream(_stream);
 
             var trailer = new Trailer(xRefPosition, xRefTable.Section.ObjectCount, _catalog.ObjectId);
             trailer.WriteToStream(_stream);

src/Synercoding.FileFormats.Pdf/Synercoding.FileFormats.Pdf.csproj

@@ -4,10 +4,14 @@
     <TargetFramework>netstandard1.6</TargetFramework>
     <LangVersion>7.3</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.0-alpha001</Version>
+    <Version>1.0.0-alpha002</Version>
     <Authors>Synercoding</Authors>
     <Description>Contains classes which makes it easy to quickly create a pdf file</Description>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+    <PackageReleaseNotes>Added the ability to indicate that the PdfWriter does not own the stream.</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/synercoder/FileFormats.Pdf</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/synercoder/FileFormats.Pdf/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/synercoder/FileFormats.Pdf</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>