Add support for JPX filter

Author: BobLd

UglyToad.PdfPig.Rendering.Skia.Tests/ExpectedImages/pdfpig_skia/68-1990-01_A_1.png

@@ -94,6 +94,12 @@ public class TestRendering
         {
             // These are not perfect yet and can be updated once the rendering is improved
             new object[]
+            {
+                // Output image is wrong - but renders JPX image
+                "68-1990-01_A_1.png",
+                "68-1990-01_A.pdf", 1, 2
+            },
+            new object[]
             {
                 "68-1990-01_A_10.png",
                 "68-1990-01_A.pdf", 10, 2

UglyToad.PdfPig.Rendering.Skia.Tests/TestRendering.cs

@@ -305,6 +305,9 @@
 	  <None Update="ExpectedImages\pdfpig_skia\2108.11480_4.png">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </None>
+	  <None Update="ExpectedImages\pdfpig_skia\68-1990-01_A_1.png">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
 	  <None Update="ExpectedImages\pdfpig_skia\68-1990-01_A_10.png">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </None>

UglyToad.PdfPig.Rendering.Skia.Tests/UglyToad.PdfPig.Rendering.Skia.Tests.csproj

@@ -16,17 +16,7 @@
 using UglyToad.PdfPig.Filters;
 using UglyToad.PdfPig.Filters.Dct.JpegLibrary;
 using UglyToad.PdfPig.Filters.Jbig2.PdfboxJbig2;
-
-/* Unmerged change from project 'UglyToad.PdfPig.Rendering.Skia (net6.0)'
-Before:
-using UglyToad.PdfPig.Tokens;
-After:
-using UglyToad.PdfPig.Rendering;
-using UglyToad.PdfPig.Rendering.Skia;
-using UglyToad.PdfPig.Rendering.Skia;
-using UglyToad.PdfPig.Rendering.Skia.Helpers;
-using UglyToad.PdfPig.Tokens;
-*/
+using UglyToad.PdfPig.Filters.Jpx.OpenJpeg;
 using UglyToad.PdfPig.Tokens;
 
 namespace UglyToad.PdfPig.Rendering.Skia
@@ -46,16 +36,18 @@ private SkiaRenderingFilterProvider() : base(GetDictionary())
         {
         }
 
-
         private static Dictionary<string, IFilter> GetDictionary()
         {
+            // New filters
+            var dct = new JpegLibraryDctDecodeFilter();
+            var jbig2 = new PdfboxJbig2DecodeFilter();
+            var jpx = new OpenJpegJpxDecodeFilter();
+
+            // Standard filters
             var ascii85 = new Ascii85Filter();
             var asciiHex = new AsciiHexDecodeFilter();
             var ccitt = new CcittFaxDecodeFilter();
-            var dct = new JpegLibraryDctDecodeFilter(); // new filter
             var flate = new FlateFilter();
-            var jbig2 = new PdfboxJbig2DecodeFilter();
-            var jpx = new JpxDecodeFilter();
             var runLength = new RunLengthFilter();
             var lzw = new LzwFilter();
 
@@ -67,11 +59,11 @@ private static Dictionary<string, IFilter> GetDictionary()
                 { NameToken.AsciiHexDecodeAbbreviation.Data, asciiHex },
                 { NameToken.CcittfaxDecode.Data, ccitt },
                 { NameToken.CcittfaxDecodeAbbreviation.Data, ccitt },
-                { NameToken.DctDecode.Data, dct }, // new filter
-                { NameToken.DctDecodeAbbreviation.Data, dct }, // new filter
+                { NameToken.DctDecode.Data, dct },
+                { NameToken.DctDecodeAbbreviation.Data, dct },
                 { NameToken.FlateDecode.Data, flate },
                 { NameToken.FlateDecodeAbbreviation.Data, flate },
-                { NameToken.Jbig2Decode.Data, jbig2 }, // new filter
+                { NameToken.Jbig2Decode.Data, jbig2 },
                 { NameToken.JpxDecode.Data, jpx },
                 { NameToken.RunLengthDecode.Data, runLength },
                 { NameToken.RunLengthDecodeAbbreviation.Data, runLength },

UglyToad.PdfPig.Rendering.Skia/SkiaRenderingFilterProvider.cs

@@ -42,6 +42,7 @@
 		<PackageReference Include="PdfPig" Version="0.1.10" />
 		<PackageReference Include="PdfPig.Filters.Dct.JpegLibrary" Version="0.1.10.1" />
 		<PackageReference Include="PdfPig.Filters.Jbig2.PdfboxJbig2" Version="0.1.10.1" />
+		<PackageReference Include="PdfPig.Filters.Jpx.OpenJpegDotNet" Version="0.1.10.1" />
 		<PackageReference Include="SkiaSharp" Version="2.88.9" />
 		<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
 	</ItemGroup>