Updated imagesharp + can reuse pdf image on multiple pages

Author: synercoder

src/Synercoding.FileFormats.Pdf/Helpers/IStreamWriteable.cs

@@ -2,7 +2,7 @@
 
 namespace Synercoding.FileFormats.Pdf.Helpers
 {
-    internal interface IStreamWriteable
+    public interface IStreamWriteable
     {
         /// <summary>
         /// Write the object to the provided stream

src/Synercoding.FileFormats.Pdf/PdfInternals/Objects/IPdfObject.cs

@@ -3,7 +3,7 @@
 
 namespace Synercoding.FileFormats.Pdf.PdfInternals.Objects
 {
-    internal interface IPdfObject : IStreamWriteable, IDisposable
+    public interface IPdfObject : IStreamWriteable, IDisposable
     {
         PdfReference Reference { get; }
         bool IsWritten { get; }

src/Synercoding.FileFormats.Pdf/PdfInternals/Objects/Image.cs

@@ -1,17 +1,16 @@
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 using Synercoding.FileFormats.Pdf.Extensions;
 using System;
 using System.IO;
 
 namespace Synercoding.FileFormats.Pdf.PdfInternals.Objects
 {
-    internal class Image : IPdfObject, IDisposable
+    public class Image : IPdfObject, IDisposable
     {
-        private readonly Image<Rgba32> _image;
+        private readonly SixLabors.ImageSharp.Image _image;
         private bool _disposed;
 
-        public Image(PdfReference id, Image<Rgba32> image)
+        internal Image(PdfReference id, SixLabors.ImageSharp.Image image)
         {
             Reference = id;
             _image = image;

src/Synercoding.FileFormats.Pdf/PdfInternals/PdfReference.cs

@@ -1,6 +1,6 @@
 namespace Synercoding.FileFormats.Pdf.PdfInternals
 {
-    internal struct PdfReference
+    public struct PdfReference
     {
         public PdfReference(int objectId)
             : this(objectId, 0)

src/Synercoding.FileFormats.Pdf/PdfPage.cs

@@ -1,4 +1,5 @@
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using Synercoding.FileFormats.Pdf.Helpers;
 using Synercoding.FileFormats.Pdf.PdfInternals.Objects;
 using Synercoding.FileFormats.Pdf.PdfInternals.XRef;
@@ -71,7 +72,7 @@ public Rectangle TrimBox
         /// <param name="image">The image to be added</param>
         /// <param name="rectangle">The <see cref="Rectangle"/> that represents the placement on the page</param>
         /// <returns>This <see cref="PdfPage"/> so calls can be chained.</returns>
-        public PdfPage AddImage(ImageSharp.Image<Rgba32> image, Rectangle rectangle)
+        public PdfPage AddImage(ImageSharp.Image image, Rectangle rectangle)
         {
             return _addImage(image, rectangle, true);
         }
@@ -104,7 +105,7 @@ public PdfPage AddImage(Stream image, Rectangle rectangle)
         /// <param name="image">The image to be added</param>
         /// <param name="matrix">The <see cref="Matrix"/> that represents the placement on the page</param>
         /// <returns>This <see cref="PdfPage"/> so calls can be chained.</returns>
-        public PdfPage AddImage(ImageSharp.Image<Rgba32> image, Matrix matrix)
+        public PdfPage AddImage(ImageSharp.Image image, Matrix matrix)
         {
             return _addImage(image, matrix, true);
         }
@@ -131,32 +132,64 @@ public PdfPage AddImage(Stream image, Matrix matrix)
             return _addImage(ImageSharp.Image.Load(image), matrix, false);
         }
 
-        private PdfPage _addImage(ImageSharp.Image<Rgba32> image, Rectangle rectangle, bool clone)
+        /// <summary>
+        /// Add image to the <see cref="PdfPage"/>
+        /// </summary>
+        /// <param name="image">The image to be added</param>
+        /// <param name="rectangle">The <see cref="Rectangle"/> that represents the placement on the page</param>
+        /// <returns>This <see cref="PdfPage"/> so calls can be chained.</returns>
+        public PdfPage AddImage(Image image, Rectangle rectangle)
+        {
+            var matrix = new Matrix(rectangle.URX - rectangle.LLX, 0, 0, rectangle.URY - rectangle.LLY, rectangle.LLX, rectangle.LLY);
+            return AddImage(image, matrix);
+        }
+
+        /// <summary>
+        /// Add image to the <see cref="PdfPage"/>
+        /// </summary>
+        /// <param name="image">The image to be added</param>
+        /// <param name="matrix">The <see cref="Matrix"/> that represents the placement on the page</param>
+        /// <returns>This <see cref="PdfPage"/> so calls can be chained.</returns>
+        public PdfPage AddImage(Image image, Matrix matrix)
+        {
+            var key = _addImageToResources(image);
+            ContentStream.AddImage(key, matrix);
+
+            return this;
+        }
+
+        private PdfPage _addImage(ImageSharp.Image image, Rectangle rectangle, bool clone)
         {
             var matrix = new Matrix(rectangle.URX - rectangle.LLX, 0, 0, rectangle.URY - rectangle.LLY, rectangle.LLX, rectangle.LLY);
 
             return _addImage(image, matrix, clone);
         }
 
-        private PdfPage _addImage(ImageSharp.Image<Rgba32> image, Matrix matrix, bool clone)
+        private PdfPage _addImage(ImageSharp.Image image, Matrix matrix, bool clone)
         {
             var key = _addImageToResources(image, clone);
             ContentStream.AddImage(key, matrix);
 
             return this;
         }
 
-        private string _addImageToResources(ImageSharp.Image<Rgba32> image, bool clone)
+        private string _addImageToResources(ImageSharp.Image image, bool clone)
         {
-            var key = "Im" + System.Threading.Interlocked.Increment(ref _pageCounter).ToString().PadLeft(6, '0');
-            var id = _tableBuilder.ReserveId();
-
             if (clone)
             {
-                image = image.Clone();
+                image = image.Clone(ctx => { });
             }
 
-            _images.Add(key, new Image(id, image));
+            var id = _tableBuilder.ReserveId();
+
+            return _addImageToResources(new Image(id, image));
+        }
+
+        private string _addImageToResources(Image image)
+        {
+            var key = "Im" + System.Threading.Interlocked.Increment(ref _pageCounter).ToString().PadLeft(6, '0');
+
+            _images.Add(key, image);
 
             return key;
         }

src/Synercoding.FileFormats.Pdf/PdfWriter.cs

@@ -76,6 +76,17 @@ public PdfWriter AddPage(Action<PdfPage> pageAction)
             return this;
         }
 
+        public Image AddImage(SixLabors.ImageSharp.Image image)
+        {
+            var id = _tableBuilder.ReserveId();
+
+            var pdfImage = new Image(id, image);
+
+            pdfImage.WriteToStream(_stream);
+
+            return pdfImage;
+        }
+
         /// <summary>
         /// Set meta information for this document
         /// </summary>

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

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
     <LangVersion>7.3</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.0-alpha003</Version>
+    <Version>1.0.0-alpha004</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>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
     <PackageReference Include="System.Memory" Version="4.5.2" />
   </ItemGroup>