Skip to content

Commit

Permalink
Refactored default value handling for ResizeImageInfo.FilterQuality
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisthekap committed Nov 5, 2024
1 parent 71790bc commit 24ba86c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion src/SingleProject/Resizetizer/src/ResizeImageInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace Microsoft.Maui.Resizetizer
{
internal class ResizeImageInfo
{
public const SKFilterQuality DefaultFilterQuality = SKFilterQuality.High;

public string? ItemSpec { get; set; }

public string? Alias { get; set; }
Expand Down Expand Up @@ -50,7 +52,7 @@ internal class ResizeImageInfo

public double ForegroundScale { get; set; } = 1.0;

public SKFilterQuality? FilterQuality { get; set; }
public SKFilterQuality FilterQuality { get; set; } = DefaultFilterQuality;

private static bool IsVectorFilename(string? filename)
=> IsVectorExtension(Path.GetExtension(filename));
Expand Down
2 changes: 1 addition & 1 deletion src/SingleProject/Resizetizer/src/SkiaSharpBitmapTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public SkiaSharpBitmapTools(ResizeImageInfo info, ILogger logger)
{
}

public SkiaSharpBitmapTools(string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality? filterQuality, ILogger logger)
public SkiaSharpBitmapTools(string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality filterQuality, ILogger logger)
: base(filename, baseSize, backgroundColor, tintColor, filterQuality, logger)
{
var sw = new Stopwatch();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public SkiaSharpImaginaryTools(ResizeImageInfo info, ILogger logger)
}

public SkiaSharpImaginaryTools(SKColor? backgroundColor, ILogger logger)
: base(null, new SKSize(1, 1), backgroundColor, null, null, logger)
: base(null, new SKSize(1, 1), backgroundColor, null, ResizeImageInfo.DefaultFilterQuality, logger)
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/SingleProject/Resizetizer/src/SkiaSharpSvgTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public SkiaSharpSvgTools(ResizeImageInfo info, ILogger logger)
{
}

public SkiaSharpSvgTools(string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality? filterQuality, ILogger logger)
public SkiaSharpSvgTools(string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality filterQuality, ILogger logger)
: base(filename, baseSize, backgroundColor, tintColor, filterQuality, logger)
{
var sw = new Stopwatch();
Expand Down
6 changes: 3 additions & 3 deletions src/SingleProject/Resizetizer/src/SkiaSharpTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static SkiaSharpTools()
span[0] = new SKPoint();
}

public static SkiaSharpTools Create(bool isVector, string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality? filterQuality, ILogger logger)
public static SkiaSharpTools Create(bool isVector, string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality filterQuality, ILogger logger)
=> isVector
? new SkiaSharpSvgTools(filename, baseSize, backgroundColor, tintColor, filterQuality, logger) as SkiaSharpTools
: new SkiaSharpBitmapTools(filename, baseSize, backgroundColor, tintColor, filterQuality, logger);
Expand All @@ -30,15 +30,15 @@ public SkiaSharpTools(ResizeImageInfo info, ILogger logger)
{
}

public SkiaSharpTools(string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality? filterQuality, ILogger logger)
public SkiaSharpTools(string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, SKFilterQuality filterQuality, ILogger logger)
{
Logger = logger;
Filename = filename;
BaseSize = baseSize;
BackgroundColor = backgroundColor;
Paint = new SKPaint
{
FilterQuality = filterQuality ?? SKFilterQuality.High
FilterQuality = filterQuality
};

if (tintColor is SKColor tint)
Expand Down

0 comments on commit 24ba86c

Please sign in to comment.