cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-09-11 15:26:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix more pdf tests

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2022-08-13 20:48:10 -04:00
parent afd6fd7fa5
commit 7dc06823c9
9 changed files with 82 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NAPS2.Images/IPdfRenderer.cs
View File

@ -2,8 +2,8 @@ namespace NAPS2.Images;
public interface IPdfRenderer
{
IEnumerable<IMemoryImage> Render(ImageContext imageContext, string path, float defaultDpi, string? password = null);
IEnumerable<IMemoryImage> Render(ImageContext imageContext, string path, PdfRenderSize renderSize, string? password = null);
IEnumerable<IMemoryImage> Render(ImageContext imageContext, byte[] buffer, int length, float defaultDpi,
IEnumerable<IMemoryImage> Render(ImageContext imageContext, byte[] buffer, int length, PdfRenderSize renderSize,
string? password = null);
}

24
NAPS2.Images/PdfRenderSize.cs Normal file
View File

@ -0,0 +1,24 @@
namespace NAPS2.Images;
public class PdfRenderSize
{
public static PdfRenderSize FromDpi(float dpi)
{
return new PdfRenderSize { Dpi = dpi };
}
public static PdfRenderSize FromDimensions(int width, int height)
{
return new PdfRenderSize { Width = width, Height = height };
}
private PdfRenderSize()
{
}
public float? Dpi { get; private init; }
public int? Width { get; private init; }
public int? Height { get; private init; }
}

5
NAPS2.Images/Storage/ImageContext.cs
View File

@ -53,7 +53,7 @@ public abstract class ImageContext
throw new InvalidOperationException(
"Unable to render pdf page as the ImageContext wasn't created with an IPdfRenderer.");
}
renderedPdf = _pdfRenderer.Render(this, fileStorage.FullPath, 300).Single();
renderedPdf = _pdfRenderer.Render(this, fileStorage.FullPath, PdfRenderSize.FromDpi(300)).Single();
return true;
}
renderedPdf = null;
@ -70,7 +70,8 @@ public abstract class ImageContext
"Unable to render pdf page as the ImageContext wasn't created with an IPdfRenderer.");
}
var stream = memoryStorage.Stream;
renderedPdf = _pdfRenderer.Render(this, stream.GetBuffer(), (int) stream.Length, 300).Single();
renderedPdf = _pdfRenderer.Render(this, stream.GetBuffer(), (int) stream.Length, PdfRenderSize.FromDpi(300))
.Single();
return true;
}
renderedPdf = null;

9
NAPS2.Sdk.Tests/Asserts/PdfAsserts.cs
View File

@ -78,8 +78,10 @@ public static class PdfAsserts
Assert.True(File.Exists(filePath));
var renderer = new PdfiumPdfRenderer();
// TODO: Optimize?
var dpi = TestImageContextFactory.Get().Load(expectedImages[0]).HorizontalResolution;
var actualImages = renderer.Render(TestImageContextFactory.Get(), filePath, dpi, password).ToList();
using var firstExpectedImage = TestImageContextFactory.Get().Load(expectedImages[0]);
// TODO: Can/should we specify size per page?
var actualImages = renderer.Render(TestImageContextFactory.Get(), filePath,
PdfRenderSize.FromDimensions(firstExpectedImage.Width, firstExpectedImage.Height), password).ToList();
// var actualImages = renderer.Render(
// TestImageContextFactory.Get(),
// filePath,
@ -87,7 +89,8 @@ public static class PdfAsserts
Assert.Equal(expectedImages.Length, actualImages.Count);
for (int i = 0; i < expectedImages.Length; i++)
{
ImageAsserts.Similar(expectedImages[i], actualImages[i]);
// TODO: Try and fix resolution here
ImageAsserts.Similar(expectedImages[i], actualImages[i], ignoreResolution: true);
}
}

6
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfImportExportTests.cs
View File

@ -68,8 +68,8 @@ public class PdfImportExportTests : ContextualTests
images[0].WithTransform(new RotationTransform(90)),
images[1].WithTransform(new BlackWhiteTransform())
};
ImageAsserts.Similar(PdfResources.word_p1_rotated, ImageContext.Render(newImages[0]));
ImageAsserts.Similar(PdfResources.word_p2_bw, ImageContext.Render(newImages[1]));
ImageAsserts.Similar(PdfResources.word_p1_rotated, ImageContext.Render(newImages[0]), ignoreResolution: true);
ImageAsserts.Similar(PdfResources.word_p2_bw, ImageContext.Render(newImages[1]), ignoreResolution: true);
await _exporter.Export(_exportPath, newImages, new PdfExportParams());
PdfAsserts.AssertImages(_exportPath, PdfResources.word_p1_rotated, PdfResources.word_p2_bw);
@ -89,7 +89,7 @@ public class PdfImportExportTests : ContextualTests
Assert.Equal(2, images.Count);
Assert.Single(imagesForOcr);
ImageAsserts.Similar(PdfResources.word_patcht_p1, ImageContext.Render(imagesForOcr[0]));
ImageAsserts.Similar(PdfResources.word_patcht_p1, ImageContext.Render(imagesForOcr[0]), ignoreResolution: true);
var allImages = images.Concat(imagesForOcr).ToList();

6
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfiumPdfRendererTests.cs
View File

@ -12,7 +12,7 @@ public class PdfiumPdfRendererTests : ContextualTests
var path = Path.Combine(FolderPath, "test.pdf");
File.WriteAllBytes(path, PdfResources.word_generated_pdf);
var images = new PdfiumPdfRenderer().Render(ImageContext, path, 300).ToList();
var images = new PdfiumPdfRenderer().Render(ImageContext, path, PdfRenderSize.FromDpi(300)).ToList();
Assert.Equal(2, images.Count);
ImageAsserts.Similar(PdfResources.word_p1, images[0], ignoreResolution: true);
@ -25,7 +25,7 @@ public class PdfiumPdfRendererTests : ContextualTests
var path = Path.Combine(FolderPath, "test.pdf");
File.WriteAllBytes(path, PdfResources.image_pdf);
var images = new PdfiumPdfRenderer().Render(ImageContext, path, 300).ToList();
var images = new PdfiumPdfRenderer().Render(ImageContext, path, PdfRenderSize.FromDpi(300)).ToList();
Assert.Single(images);
// This also verifies that the renderer gets the actual image dpi (72)
@ -38,7 +38,7 @@ public class PdfiumPdfRendererTests : ContextualTests
var path = Path.Combine(FolderPath, "test.pdf");
File.WriteAllBytes(path, PdfResources.image_with_text_pdf);
var images = new PdfiumPdfRenderer().Render(ImageContext, path, 300).ToList();
var images = new PdfiumPdfRenderer().Render(ImageContext, path, PdfRenderSize.FromDpi(300)).ToList();
Assert.Single(images);
// This also verifies that the renderer gets the actual image dpi (72)

51
NAPS2.Sdk/ImportExport/Pdf/PdfiumPdfRenderer.cs
View File

@ -6,22 +6,22 @@ namespace NAPS2.ImportExport.Pdf;
public class PdfiumPdfRenderer : IPdfRenderer
{
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, string path, float defaultDpi,
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, string path, PdfRenderSize renderSize,
string? password = null)
{
// Pdfium is not thread-safe
lock (PdfiumNativeLibrary.Instance)
{
using var doc = PdfDocument.Load(path, password);
foreach (var memoryImage in RenderDocument(imageContext, defaultDpi, doc))
foreach (var memoryImage in RenderDocument(imageContext, renderSize, doc))
{
yield return memoryImage;
}
}
}
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, byte[] buffer, int length, float defaultDpi,
string? password = null)
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, byte[] buffer, int length,
PdfRenderSize renderSize, string? password = null)
{
// Pdfium is not thread-safe
lock (PdfiumNativeLibrary.Instance)
@ -30,7 +30,7 @@ public class PdfiumPdfRenderer : IPdfRenderer
try
{
using var doc = PdfDocument.Load(handle.AddrOfPinnedObject(), length, password);
foreach (var memoryImage in RenderDocument(imageContext, defaultDpi, doc))
foreach (var memoryImage in RenderDocument(imageContext, renderSize, doc))
{
yield return memoryImage;
}
@ -42,7 +42,8 @@ public class PdfiumPdfRenderer : IPdfRenderer
}
}
private IEnumerable<IMemoryImage> RenderDocument(ImageContext imageContext, float defaultDpi, PdfDocument doc)
private IEnumerable<IMemoryImage> RenderDocument(ImageContext imageContext, PdfRenderSize renderSize,
PdfDocument doc)
{
var pageCount = doc.PageCount;
for (int pageIndex = 0; pageIndex < pageCount; pageIndex++)
@ -55,25 +56,39 @@ public class PdfiumPdfRenderer : IPdfRenderer
yield return image;
continue;
}
yield return RenderPageToNewImage(imageContext, page, defaultDpi);
yield return RenderPageToNewImage(imageContext, page, renderSize);
}
}
public unsafe IMemoryImage RenderPageToNewImage(ImageContext imageContext, PdfPage page, float defaultDpi)
public unsafe IMemoryImage RenderPageToNewImage(ImageContext imageContext, PdfPage page, PdfRenderSize renderSize)
{
var widthInInches = page.Width / 72;
var heightInInches = page.Height / 72;
int widthInPx, heightInPx;
int xDpi, yDpi;
if (renderSize.Dpi != null)
{
// Cap the resolution to 10k pixels in each dimension
var dpi = renderSize.Dpi.Value;
dpi = Math.Min(dpi, 10000 / heightInInches);
dpi = Math.Min(dpi, 10000 / widthInInches);
// Cap the resolution to 10k pixels in each dimension
var dpi = defaultDpi;
dpi = Math.Min(dpi, 10000 / heightInInches);
dpi = Math.Min(dpi, 10000 / widthInInches);
int widthInPx = (int) Math.Round(widthInInches * dpi);
int heightInPx = (int) Math.Round(heightInInches * dpi);
widthInPx = (int) Math.Round(widthInInches * dpi);
heightInPx = (int) Math.Round(heightInInches * dpi);
xDpi = (int) Math.Round(dpi);
yDpi = (int) Math.Round(dpi);
}
else
{
widthInPx = renderSize.Width!.Value;
heightInPx = renderSize.Height!.Value;
xDpi = (int) Math.Round(widthInPx / widthInInches * 72);
yDpi = (int) Math.Round(widthInPx / heightInInches * 72);
}
var bitmap = imageContext.Create(widthInPx, heightInPx, ImagePixelFormat.RGB24);
bitmap.SetResolution((int) Math.Round(dpi), (int) Math.Round(dpi));
bitmap.SetResolution(xDpi, yDpi);
// As Pdfium only supports BGR, to be general we need to store it in an intermediate buffer,
// then use a copy operation to get the data to our output image (which might be BGR or RGB).
@ -86,9 +101,9 @@ public class PdfiumPdfRenderer : IPdfRenderer
PdfBitmap.CreateFromPointerBgr(widthInPx, heightInPx, (IntPtr) ptr, pixelInfo.Stride);
pdfiumBitmap.FillRect(0, 0, widthInPx, heightInPx, PdfBitmap.WHITE);
pdfiumBitmap.RenderPage(page, 0, 0, widthInPx, heightInPx);
new CopyBitwiseImageOp().Perform(buffer, pixelInfo, bitmap);
return bitmap;
}
}

7
NAPS2.Sdk/ImportExport/Pdf/PdfiumWorkerCoordinator.cs
View File

@ -11,7 +11,7 @@ public class PdfiumWorkerCoordinator : IPdfRenderer
_workerPool = workerPool;
}
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, string path, float defaultDpi, string? password = null)
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, string path, PdfRenderSize renderSize, string? password = null)
{
if (password != null)
{
@ -21,13 +21,14 @@ public class PdfiumWorkerCoordinator : IPdfRenderer
// TODO: Only use worker on windows? Or what...
var image = _workerPool.Use(worker =>
{
var imageStream = new MemoryStream(worker.Service.RenderPdf(path, defaultDpi));
// TODO: Transmit render size
var imageStream = new MemoryStream(worker.Service.RenderPdf(path, renderSize.Dpi ?? 300));
return imageContext.Load(imageStream);
});
return new[] { image };
}
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, byte[] buffer, int length, float defaultDpi, string? password = null)
public IEnumerable<IMemoryImage> Render(ImageContext imageContext, byte[] buffer, int length, PdfRenderSize renderSize, string? password = null)
{
throw new NotImplementedException();
}

6
NAPS2.Sdk/Remoting/Worker/WorkerServiceImpl.cs
View File

@ -212,7 +212,8 @@ public class WorkerServiceImpl : WorkerService.WorkerServiceBase
try
{
var renderer = new PdfiumPdfRenderer();
using var image = renderer.Render(_scanningContext.ImageContext, request.Path, request.Dpi).Single();
using var image = renderer
.Render(_scanningContext.ImageContext, request.Path, PdfRenderSize.FromDpi(request.Dpi)).Single();
var stream = image.SaveToMemoryStream(ImageFileFormat.Png);
return Task.FromResult(new RenderPdfResponse
{
@ -279,7 +280,8 @@ public class WorkerServiceImpl : WorkerService.WorkerServiceBase
}).AssertNoAwait();
}
public override async Task<GetDeviceListResponse> TwainGetDeviceList(GetDeviceListRequest request, ServerCallContext context)
public override async Task<GetDeviceListResponse> TwainGetDeviceList(GetDeviceListRequest request,
ServerCallContext context)
{
using var callRef = StartCall();
try