swcs/QuestPDF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified image handling

Browse Source
This commit is contained in:
MarcinZiabek
2023-05-09 01:11:49 +02:00
parent bdb61aa545
commit 1829ed7180
8 changed files with 56 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/QuestPDF/Drawing/DocumentGenerator.cs
-1
View File
@@ -235,7 +235,6 @@ namespace QuestPDF.Drawing
if (x is QuestPDF.Elements.Image image)
{
image.TargetDpi ??= settings.RasterDpi;
image.ResizeStrategy ??= settings.ImageResizeStrategy;
image.CompressionQuality ??= settings.ImageCompressionQuality;
}
Source/QuestPDF/Elements/DynamicImage.cs
+6 -3
View File
@@ -30,8 +30,11 @@ namespace QuestPDF.Elements
if (imageData == null)
return;
using var image = SKImage.FromEncodedData(imageData);
Canvas.DrawImage(image, Position.Zero, availableSpace);
using var originalImage = SKImage.FromEncodedData(imageData);
using var compressedImage = originalImage.CompressImage(CompressionQuality.Value);
var targetImage = Helpers.Helpers.GetImageWithSmallerSize(originalImage, compressedImage);
Canvas.DrawImage(targetImage, Position.Zero, availableSpace);
}
private static ImageSize GetTargetResolution(Size availableSize, int targetDpi)
@@ -44,4 +47,4 @@ namespace QuestPDF.Elements
);
}
}
}
}
Source/QuestPDF/Elements/Image.cs
+13 -35
View File
@@ -12,7 +12,6 @@ namespace QuestPDF.Elements
internal bool UseOriginalImage { get; set; }
internal int? TargetDpi { get; set; }
internal ImageCompressionQuality? CompressionQuality { get; set; }
internal ImageResizeStrategy? ResizeStrategy { get; set; }
private const float ImageSizeSimilarityToleranceMax = 0.75f;
@@ -40,56 +39,35 @@ namespace QuestPDF.Elements
private SKImage GetImageToDraw(Size availableSpace)
{
var originalImage = DocumentImage.SkImage;
if (UseOriginalImage)
return DocumentImage.SkImage;
return originalImage;
var request = new GetImageVersionRequest
{
Resolution = GetTargetResolution(ResizeStrategy.Value, DocumentImage.Size, availableSpace, TargetDpi.Value),
CompressionQuality = CompressionQuality.Value,
ResizeStrategy = ResizeStrategy.Value
Resolution = GetTargetResolution(DocumentImage.Size, availableSpace, TargetDpi.Value),
CompressionQuality = CompressionQuality.Value
};
return DocumentImage.GetVersionOfSize(request);
var targetImage = DocumentImage.GetVersionOfSize(request);
return Helpers.Helpers.GetImageWithSmallerSize(originalImage, targetImage);
}
private static ImageSize GetTargetResolution(ImageResizeStrategy resizeStrategy, ImageSize imageResolution, Size availableAreaSize, int targetDpi)
private static ImageSize GetTargetResolution(ImageSize imageResolution, Size availableAreaSize, int targetDpi)
{
if (resizeStrategy == ImageResizeStrategy.Never)
return imageResolution;
var scalingFactor = targetDpi / (float)DocumentSettings.DefaultRasterDpi;
var targetResolution = new ImageSize(
(int)(availableAreaSize.Width * scalingFactor),
(int)(availableAreaSize.Height * scalingFactor));
if (resizeStrategy == ImageResizeStrategy.Always)
return targetResolution;
var isSignificantlySmaller = IsImageSignificantlySmallerThanDrawingArea(imageResolution, targetResolution);
if (resizeStrategy == ImageResizeStrategy.ScaleOnlyToSignificantlySmallerResolution && isSignificantlySmaller)
return targetResolution;
var isImageResolutionSmallerThanTarget = imageResolution.Width < targetResolution.Width || imageResolution.Height < targetResolution.Height;
var isSmaller = IsImageSmallerThanDrawingArea(imageResolution, targetResolution);
if (isImageResolutionSmallerThanTarget)
return imageResolution;
if (resizeStrategy == ImageResizeStrategy.ScaleOnlyToSmallerResolution && isSmaller)
return targetResolution;
return imageResolution;
}
private static bool IsImageSmallerThanDrawingArea(ImageSize imageResolution, ImageSize targetResolution)
{
return imageResolution.Width < targetResolution.Width || imageResolution.Height < targetResolution.Height;
}
private static bool IsImageSignificantlySmallerThanDrawingArea(ImageSize imageResolution, ImageSize targetResolution, float sizeSimilarityThreshold = ImageSizeSimilarityToleranceMax)
{
var widthRatio = targetResolution.Width / imageResolution.Width;
var heightRatio = targetResolution.Height / imageResolution.Height;
return widthRatio < sizeSimilarityThreshold && heightRatio < sizeSimilarityThreshold;
return targetResolution;
}
}
}
Source/QuestPDF/Fluent/ImageModelExtensions.cs
-6
View File
@@ -52,12 +52,6 @@ namespace QuestPDF.Fluent
return this;
}
public ImageDescriptor WithResizeStrategy(ImageResizeStrategy strategy)
{
ImageElement.ResizeStrategy = strategy;
return this;
}
#region Aspect Ratio
public ImageDescriptor FitWidth()
Source/QuestPDF/Helpers/Helpers.cs
+33
View File
@@ -75,5 +75,38 @@ namespace QuestPDF.Helpers
_ => throw new ArgumentOutOfRangeException(nameof(quality), quality, null)
};
}
internal static SKImage CompressImage(this SKImage image, ImageCompressionQuality compressionQuality)
{
var targetFormat = image.Info.IsOpaque
? SKEncodedImageFormat.Jpeg
: SKEncodedImageFormat.Png;
if (targetFormat == SKEncodedImageFormat.Png)
compressionQuality = ImageCompressionQuality.Best;
var data = image.Encode(targetFormat, compressionQuality.ToQualityValue());
return SKImage.FromEncodedData(data);
}
internal static SKImage ResizeAndCompressImage(this SKImage image, ImageSize targetResolution, ImageCompressionQuality compressionQuality)
{
if (image.Width == targetResolution.Width && image.Height == targetResolution.Height)
return CompressImage(image, compressionQuality);
var imageInfo = new SKImageInfo(targetResolution.Width, targetResolution.Height);
using var resultImage = SKImage.Create(imageInfo);
image.ScalePixels(resultImage.PeekPixels(), SKFilterQuality.Medium);
return CompressImage(resultImage, compressionQuality);
}
internal static SKImage GetImageWithSmallerSize(SKImage one, SKImage second)
{
return one.EncodedData.Size < second.EncodedData.Size
? one
: second;
}
}
}
Source/QuestPDF/Infrastructure/DocumentSettings.cs
+3 -6
View File
@@ -18,17 +18,14 @@
/// The default value is 90 (very high quality).
/// </summary>
public ImageCompressionQuality ImageCompressionQuality { get; set; } = ImageCompressionQuality.VeryHigh;
// TODO: add comments
public ImageResizeStrategy ImageResizeStrategy { get; set; } = ImageResizeStrategy.ScaleOnlyToSignificantlySmallerResolution;
/// <summary>
/// The DPI (pixels-per-inch) at which images and features without native PDF support will be rasterized.
/// A larger DPI would create a PDF that reflects the original intent with better fidelity, but it can make for larger PDF files too, which would use more memory while rendering, and it would be slower to be processed or sent online or to printer.
/// When generating images, this parameter also controls the resolution of the generated content.
/// Default value is 72.
/// Default value is 144.
/// </summary>
public int RasterDpi { get; set; } = DefaultRasterDpi;
public int RasterDpi { get; set; } = DefaultRasterDpi * 2;
public ContentDirection ContentDirection { get; set; } = ContentDirection.LeftToRight;
Source/QuestPDF/Infrastructure/Image.cs
+1 -28
View File
@@ -11,7 +11,6 @@ namespace QuestPDF.Infrastructure
{
internal ImageSize Resolution { get; set; }
internal ImageCompressionQuality CompressionQuality { get; set; }
internal ImageResizeStrategy ResizeStrategy { get; set; }
}
public class Image : IDisposable
@@ -46,37 +45,11 @@ namespace QuestPDF.Infrastructure
return cacheKey.image;
}
var result = ResizeAndCompressImage(SkImage, request.Resolution, request.CompressionQuality);
var result = SkImage.ResizeAndCompressImage(request.Resolution, request.CompressionQuality);
ScaledImageCache.AddLast((request, result));
return result;
}
private static SKImage CompressImage(SKImage image, ImageCompressionQuality compressionQuality)
{
var targetFormat = image.Info.IsOpaque
? SKEncodedImageFormat.Jpeg
: SKEncodedImageFormat.Png;
if (targetFormat == SKEncodedImageFormat.Png)
compressionQuality = ImageCompressionQuality.Best;
var data = image.Encode(targetFormat, compressionQuality.ToQualityValue());
return SKImage.FromEncodedData(data);
}
private static SKImage ResizeAndCompressImage(SKImage image, ImageSize targetResolution, ImageCompressionQuality compressionQuality)
{
if (image.Width == targetResolution.Width && image.Height == targetResolution.Height)
return CompressImage(image, compressionQuality);
var imageInfo = new SKImageInfo(targetResolution.Width, targetResolution.Height);
using var resultImage = SKImage.Create(imageInfo);
image.ScalePixels(resultImage.PeekPixels(), SKFilterQuality.Medium);
return CompressImage(resultImage, compressionQuality);
}
#endregion
#region public constructors
Source/QuestPDF/Infrastructure/ImageResizeStrategy.cs
-11
View File
@@ -1,11 +0,0 @@
namespace QuestPDF.Infrastructure
{
public enum ImageResizeStrategy
{
// TODO: add comments
Always,
ScaleOnlyToSmallerResolution,
ScaleOnlyToSignificantlySmallerResolution,
Never
}
}