Removed unused usings.

Removed unneeded Repeat test attribute. Simplified rendering methods.
Dtronix · Nov 9, 2022 · dfba6ff · dfba6ff
1 parent d8b07bd
commit dfba6ff
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 289 deletions.
diff --git a/src/DtronixPdf.Tests/PdfDocumentTests.cs b/src/DtronixPdf.Tests/PdfDocumentTests.cs
@@ -7,7 +7,6 @@ namespace DtronixPdf.Tests
     public class PdfDocumentTests
     {
         [Test]
-        [Repeat(500)]
         public void LoadsDocument()
         {
             using var document = PdfDocument.Load("TestPdf.pdf", null);

diff --git a/src/DtronixPdf.Tests/PdfPageRenderTests.cs b/src/DtronixPdf.Tests/PdfPageRenderTests.cs
@@ -19,10 +19,7 @@ public void RendererCreatesImageSize()
         {
             using var document = PdfDocument.Load("TestPdf.pdf", null);
             using var page = document.GetPage(0);
-            var renderPage = page.Render(
-                1,
-                (uint)Color.White.ToArgb(),
-                new Boundary(0, 0, page.Width, page.Height));
+            var renderPage = page.Render(1);
 
             var image = renderPage.GetImage();
 
@@ -35,10 +32,7 @@ public void RendererSavesImage()
         {
             using var document = PdfDocument.Load("TestPdf.pdf", null);
             using var page = document.GetPage(0);
-            var renderPage = page.Render(
-                1,
-                (uint)Color.White.ToArgb(),
-                new Boundary(0, 0, page.Width, page.Height));
+            var renderPage = page.Render(1);
 
             using var writer = File.OpenWrite("test.png");
             renderPage.GetImage().Save(writer, new PngEncoder());

diff --git a/src/DtronixPdf.Tests/PdfPageTests.cs b/src/DtronixPdf.Tests/PdfPageTests.cs
@@ -7,20 +7,6 @@ namespace DtronixPdf.Tests
 {
     public class PdfPageTests
     {
-
-        [SetUp]
-        public void Setup()
-        {
-            //PDFiumCoreManager.Initialize();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            //PDFiumCoreManager.Destroy();
-        }
-
-
         [Test]
         public void LoadsPage()
         {

diff --git a/src/DtronixPdf/Actions/RenderPageAction.cs b/src/DtronixPdf/Actions/RenderPageAction.cs
diff --git a/src/DtronixPdf/PDFiumManager.cs b/src/DtronixPdf/PDFiumManager.cs
@@ -1,28 +1,25 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using DtronixCommon.Threading.Dispatcher;
 using PDFiumCore;
 
 namespace DtronixPdf
 {
 
-    public class PdfiumCoreManager
+    public class PdfiumManager
     {
         private static bool IsInitialized;
 
-        private static PdfiumCoreManager _managerDefaultInstance;
-        public static PdfiumCoreManager Default => _managerDefaultInstance ??= new PdfiumCoreManager();
+        private static PdfiumManager _managerDefaultInstance;
+        public static PdfiumManager Default => _managerDefaultInstance ??= new PdfiumManager();
 
         private readonly PdfActionSynchronizer _synchronizer;
 
         private readonly List<PdfDocument> LoadedDocuments = new ();
 
-        private static readonly ConcurrentBag<PdfiumCoreManager> LoadedManagers = new ();
+        private static readonly ConcurrentBag<PdfiumManager> LoadedManagers = new ();
 
-        private PdfiumCoreManager()
+        private PdfiumManager()
         {
             LoadedManagers.Add(this);
 

diff --git a/src/DtronixPdf/PdfActionSynchronizer.cs b/src/DtronixPdf/PdfActionSynchronizer.cs
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using DtronixCommon.Threading.Dispatcher;
 
 namespace DtronixPdf
 {

diff --git a/src/DtronixPdf/PdfBitmap.cs b/src/DtronixPdf/PdfBitmap.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Threading.Tasks;
 using DtronixCommon;
-using DtronixCommon.Threading.Dispatcher;
-using DtronixCommon.Threading.Dispatcher.Actions;
 using PDFiumCore;
 
 namespace DtronixPdf
@@ -31,7 +28,6 @@ public class PdfBitmap : IDisposable
         /// Only call within the synchronizer since dll calls are made.
         /// </summary>
         /// <param name="pdfBitmap"></param>
-        /// <param name="image"></param>
         /// <param name="synchronizer"></param>
         /// <param name="scale"></param>
         /// <param name="viewport"></param>

diff --git a/src/DtronixPdf/PdfDocument.cs b/src/DtronixPdf/PdfDocument.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 using PDFiumCore;
 
 
@@ -24,15 +21,12 @@ private PdfDocument(PdfActionSynchronizer synchronizer, FpdfDocumentT instance)
         {
             Synchronizer = synchronizer;
             Instance = instance;
-            PdfiumCoreManager.Default.AddDocument(this);
+            PdfiumManager.Default.AddDocument(this);
         }
 
-        public static PdfDocument Load(
-            string path,
-            string password,
-            CancellationToken cancellationToken = default)
+        public static PdfDocument Load(string path, string password)
         {
-            PdfiumCoreManager.Initialize();
+            PdfiumManager.Initialize();
 
             var synchronizer = new PdfActionSynchronizer();
 
@@ -48,10 +42,7 @@ public static PdfDocument Load(
 
         }
 
-        public static unsafe PdfDocument Load(
-            Stream stream,
-            string password,
-            CancellationToken cancellationToken = default)
+        public static unsafe PdfDocument Load(Stream stream, string password)
         {
             var synchronizer = new PdfActionSynchronizer();
 
@@ -67,7 +58,7 @@ public static unsafe PdfDocument Load(
             while ((readLength = stream.Read(ptrSpan)) > 0)
                 ptrSpan = ptrSpan.Slice(readLength);
 
-            PdfiumCoreManager.Initialize();
+            PdfiumManager.Initialize();
 
             int pages = -1;
             var result = synchronizer.SyncExec(() =>
@@ -185,7 +176,7 @@ public unsafe void Dispose()
 
             Synchronizer.SyncExec(() => fpdfview.FPDF_CloseDocument(Instance));
 
-            PdfiumCoreManager.Default.RemoveDocument(this);
+            PdfiumManager.Default.RemoveDocument(this);
 
             // Free the native memory.
             if (_documentPointer != null)

diff --git a/src/DtronixPdf/PdfPage.Edit.cs b/src/DtronixPdf/PdfPage.Edit.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Mono.TextTemplating;
-using PDFiumCore;
+using PDFiumCore;
 
 namespace DtronixPdf
 {