Back-merge 1.6.1 release

Source/Demo/WPF/DemoWindow.xaml

@@ -43,7 +43,7 @@
                         <TextBlock Text="Generate Image" VerticalAlignment="Center"/>
                     </StackPanel>
                 </Button>
-                <Button IsEnabled="False">
+                <Button Click="OnGeneratePdf_Click">
                     <StackPanel Orientation="Horizontal">
                         <Image Source="{Binding ConverterParameter=pdf, Converter={StaticResource Converter}}" MaxHeight="18" Margin="0 0 5 0"/>
                         <TextBlock Text="Generate PDF" VerticalAlignment="Center"/>

Source/Demo/WPF/DemoWindow.xaml.cs

@@ -17,7 +17,9 @@
 using System.Windows.Media;
 using System.Windows.Threading;
 using TheArtOfDev.HtmlRenderer.Demo.Common;
+using TheArtOfDev.HtmlRenderer.PdfSharp;
 using TheArtOfDev.HtmlRenderer.WPF;
+using PdfSharp;
 
 namespace TheArtOfDev.HtmlRenderer.Demo.WPF
 {
@@ -111,6 +113,24 @@ private void OnGenerateImage_Click(object sender, RoutedEventArgs e)
             w.ShowDialog();
         }
 
+        /// <summary>
+        /// Create PDF using PdfSharp project, save to file and open that file.
+        /// </summary>
+        private void OnGeneratePdf_Click(object sender, RoutedEventArgs e)
+        {
+            var config = new PdfGenerateConfig();
+            config.PageSize = PageSize.A4;
+            config.SetMargins(20);
+
+            var doc = PdfGenerator.GeneratePdf(_mainControl.GetHtml(), config, null, DemoUtils.OnStylesheetLoad, HtmlRenderingHelper.OnImageLoadPdfSharp);
+
+            var tmpFile = Path.GetTempFileName();
+            var pdfFile = Path.ChangeExtension(tmpFile, ".pdf");
+            doc.Save(pdfFile);
+
+            Process.Start(new ProcessStartInfo(pdfFile) { UseShellExecute = true });
+        }
+
         /// <summary>
         /// Execute performance test by setting all sample HTMLs in a loop.
         /// </summary>

Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj

@@ -15,6 +15,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HtmlRenderer.PdfSharp\HtmlRenderer.PdfSharp.csproj" />
     <ProjectReference Include="..\..\HtmlRenderer.WPF\HtmlRenderer.WPF.csproj" />
     <ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj" />
     <ProjectReference Include="..\Common\HtmlRenderer.Demo.Common.csproj" />

Source/Demo/WPF/HtmlRenderingHelper.cs

@@ -16,6 +16,7 @@
 using System.Threading;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using PdfSharp.Drawing;
 using TheArtOfDev.HtmlRenderer.Core.Entities;
 using TheArtOfDev.HtmlRenderer.Demo.Common;
 using TheArtOfDev.HtmlRenderer.WPF;
@@ -60,6 +61,7 @@ public static BitmapEncoder GetBitmapEncoder(string ext)
                     return new PngBitmapEncoder();
 
             }
+
         }
 
         /// <summary>
@@ -118,12 +120,29 @@ public static void OnImageLoad(object sender, HtmlImageLoadEventArgs args)
             ImageLoad(args);
         }
 
+        /// <summary>
+        /// On image load in renderer set the image by event async.
+        /// </summary>
+        public static void OnImageLoadPdfSharp(object sender, HtmlImageLoadEventArgs args)
+        {
+            ImageLoad(args, true);
+        }
+
         /// <summary>
         /// On image load in renderer set the image by event async.
         /// </summary>
         public static void ImageLoad(HtmlImageLoadEventArgs e)
+        {
+            ImageLoad(e, false);
+        }
+
+        /// <summary>
+        /// On image load in renderer set the image by event async.
+        /// </summary>
+        public static void ImageLoad(HtmlImageLoadEventArgs e, bool pdfSharp)
         {
             var img = TryLoadResourceImage(e.Src);
+            var imgObj = pdfSharp ? (object)(img != null ? CreatePdfSharpImage(img) : null) : img;
 
             if (!e.Handled && e.Attributes != null)
             {
@@ -150,13 +169,31 @@ public static void ImageLoad(HtmlImageLoadEventArgs e)
                 {
                     var split = e.Attributes["byrect"].Split(',');
                     var rect = new Rect(Int32.Parse(split[0]), Int32.Parse(split[1]), Int32.Parse(split[2]), Int32.Parse(split[3]));
-                    e.Callback(img ?? TryLoadResourceImage("htmlicon"), rect.X, rect.Y, rect.Width, rect.Height);
+                    var defaultResourceImage = TryLoadResourceImage("htmlicon");
+                    var defaultImg = pdfSharp && defaultResourceImage != null ? (object)CreatePdfSharpImage(defaultResourceImage) : defaultResourceImage;
+                    e.Callback(imgObj ?? defaultImg, rect.X, rect.Y, rect.Width, rect.Height);
                     return;
                 }
             }
 
             if (img != null)
-                e.Callback(img);
+                e.Callback(imgObj);
+        }
+
+        /// <summary>
+        /// Convert image to PNG before creating <see cref="XImage"/> because PdfSharp does not support GIF streams.
+        /// </summary>
+        private static XImage CreatePdfSharpImage(BitmapSource image)
+        {
+            var encoder = new PngBitmapEncoder();
+            encoder.Frames.Add(BitmapFrame.Create(image));
+
+            using (var ms = new MemoryStream())
+            {
+                encoder.Save(ms);
+                ms.Position = 0;
+                return XImage.FromStream(ms);
+            }
         }
     }
 }

Source/Demo/WinForms/HtmlRenderingHelper.cs

@@ -14,6 +14,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Threading;
 using TheArtOfDev.HtmlRenderer.Core.Entities;
@@ -71,18 +72,11 @@ public static Image TryLoadResourceImage(string src)
         public static XImage TryLoadResourceXImage(string src)
         {
             var img = TryLoadResourceImage(src);
-            XImage xImg;
 
             if (img == null)
                 return null;
 
-            using (var ms = new MemoryStream())
-            {
-                img.Save(ms, img.RawFormat);
-                xImg = img != null ? XImage.FromStream(ms) : null;
-            }
-
-            return xImg;
+            return CreatePdfSharpImage(img);
         }
 
         /// <summary>
@@ -107,20 +101,10 @@ public static void OnImageLoadPdfSharp(object sender, HtmlImageLoadEventArgs e)
         public static void ImageLoad(HtmlImageLoadEventArgs e, bool pdfSharp)
         {
             var img = TryLoadResourceImage(e.Src);
-            XImage xImg = null;
-
-            if (img != null)
-            {
-                using (var ms = new MemoryStream())
-                {
-                    img.Save(ms, img.RawFormat);
-                    xImg = img != null ? XImage.FromStream(ms) : null;
-                }
-            }
 
             object imgObj;
             if (pdfSharp)
-                imgObj = xImg;
+                imgObj = img != null ? CreatePdfSharpImage(img) : null;
             else
                 imgObj = img;
 
@@ -157,5 +141,17 @@ public static void ImageLoad(HtmlImageLoadEventArgs e, bool pdfSharp)
             if (img != null)
                 e.Callback(imgObj);
         }
+
+        /// <summary>
+        /// Convert image to PNG before creating <see cref="XImage"/> because PdfSharp does not support GIF streams.
+        /// </summary>
+        private static XImage CreatePdfSharpImage(Image img)
+        {
+            using (var ms = new MemoryStream())
+            {
+                img.Save(ms, ImageFormat.Png);
+                return XImage.FromStream(ms);
+            }
+        }
     }
 }

Source/Directory.Build.props

@@ -5,9 +5,9 @@
     <Owners>Arthur Teplitzki</Owners>
     <Company>Open source hosted on GitHub</Company>
     <Copyright>Copyright © 2008-2026</Copyright>
-    <Version>1.6.0</Version>
-    <AssemblyVersion>1.6.0.0</AssemblyVersion>
-    <FileVersion>1.6.0.0</FileVersion>
+    <Version>1.6.1-dev</Version>
+    <AssemblyVersion>1.6.1.0</AssemblyVersion>
+    <FileVersion>1.6.1.0</FileVersion>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageProjectUrl>https://codeplexarchive.org/project/HtmlRenderer</PackageProjectUrl>

Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>TheArtOfDev.HtmlRenderer.WPF</RootNamespace>
     <UseWPF>true</UseWPF>

Source/HtmlRenderer.WinForms/HtmlRenderer.WinForms.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>TheArtOfDev.HtmlRenderer.WinForms</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>