|
|
|
|
@ -29,9 +29,7 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="logger">The application logger.</param>
|
|
|
|
|
/// <param name="appPaths">The application paths.</param>
|
|
|
|
|
public SkiaEncoder(
|
|
|
|
|
ILogger<SkiaEncoder> logger,
|
|
|
|
|
IApplicationPaths appPaths)
|
|
|
|
|
public SkiaEncoder(ILogger<SkiaEncoder> logger, IApplicationPaths appPaths)
|
|
|
|
|
{
|
|
|
|
|
_logger = logger;
|
|
|
|
|
_appPaths = appPaths;
|
|
|
|
|
@ -102,19 +100,14 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
/// <returns>The converted format.</returns>
|
|
|
|
|
public static SKEncodedImageFormat GetImageFormat(ImageFormat selectedFormat)
|
|
|
|
|
{
|
|
|
|
|
switch (selectedFormat)
|
|
|
|
|
return selectedFormat switch
|
|
|
|
|
{
|
|
|
|
|
case ImageFormat.Bmp:
|
|
|
|
|
return SKEncodedImageFormat.Bmp;
|
|
|
|
|
case ImageFormat.Jpg:
|
|
|
|
|
return SKEncodedImageFormat.Jpeg;
|
|
|
|
|
case ImageFormat.Gif:
|
|
|
|
|
return SKEncodedImageFormat.Gif;
|
|
|
|
|
case ImageFormat.Webp:
|
|
|
|
|
return SKEncodedImageFormat.Webp;
|
|
|
|
|
default:
|
|
|
|
|
return SKEncodedImageFormat.Png;
|
|
|
|
|
}
|
|
|
|
|
ImageFormat.Bmp => SKEncodedImageFormat.Bmp,
|
|
|
|
|
ImageFormat.Jpg => SKEncodedImageFormat.Jpeg,
|
|
|
|
|
ImageFormat.Gif => SKEncodedImageFormat.Gif,
|
|
|
|
|
ImageFormat.Webp => SKEncodedImageFormat.Webp,
|
|
|
|
|
_ => SKEncodedImageFormat.Png
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static bool IsTransparentRow(SKBitmap bmp, int row)
|
|
|
|
|
@ -146,64 +139,35 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
private SKBitmap CropWhiteSpace(SKBitmap bitmap)
|
|
|
|
|
{
|
|
|
|
|
var topmost = 0;
|
|
|
|
|
for (int row = 0; row < bitmap.Height; ++row)
|
|
|
|
|
{
|
|
|
|
|
if (IsTransparentRow(bitmap, row))
|
|
|
|
|
{
|
|
|
|
|
topmost = row + 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
while (topmost < bitmap.Height && IsTransparentRow(bitmap, topmost))
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
topmost++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int bottommost = bitmap.Height;
|
|
|
|
|
for (int row = bitmap.Height - 1; row >= 0; --row)
|
|
|
|
|
while (bottommost >= 0 && IsTransparentRow(bitmap, bottommost - 1))
|
|
|
|
|
{
|
|
|
|
|
if (IsTransparentRow(bitmap, row))
|
|
|
|
|
{
|
|
|
|
|
bottommost = row;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
bottommost--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int leftmost = 0, rightmost = bitmap.Width;
|
|
|
|
|
for (int col = 0; col < bitmap.Width; ++col)
|
|
|
|
|
{
|
|
|
|
|
if (IsTransparentColumn(bitmap, col))
|
|
|
|
|
var leftmost = 0;
|
|
|
|
|
while (leftmost < bitmap.Width && IsTransparentColumn(bitmap, leftmost))
|
|
|
|
|
{
|
|
|
|
|
leftmost = col + 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
leftmost++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int col = bitmap.Width - 1; col >= 0; --col)
|
|
|
|
|
{
|
|
|
|
|
if (IsTransparentColumn(bitmap, col))
|
|
|
|
|
var rightmost = bitmap.Width;
|
|
|
|
|
while (rightmost >= 0 && IsTransparentColumn(bitmap, rightmost - 1))
|
|
|
|
|
{
|
|
|
|
|
rightmost = col;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
rightmost--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var newRect = SKRectI.Create(leftmost, topmost, rightmost - leftmost, bottommost - topmost);
|
|
|
|
|
|
|
|
|
|
using (var image = SKImage.FromBitmap(bitmap))
|
|
|
|
|
using (var subset = image.Subset(newRect))
|
|
|
|
|
{
|
|
|
|
|
using var image = SKImage.FromBitmap(bitmap);
|
|
|
|
|
using var subset = image.Subset(newRect);
|
|
|
|
|
return SKBitmap.FromImage(subset);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <inheritdoc />
|
|
|
|
|
/// <exception cref="ArgumentNullException">The path is null.</exception>
|
|
|
|
|
@ -216,15 +180,13 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
throw new FileNotFoundException("File not found", path);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
using (var codec = SKCodec.Create(path, out SKCodecResult result))
|
|
|
|
|
{
|
|
|
|
|
using var codec = SKCodec.Create(path, out SKCodecResult result);
|
|
|
|
|
EnsureSuccess(result);
|
|
|
|
|
|
|
|
|
|
var info = codec.Info;
|
|
|
|
|
|
|
|
|
|
return new ImageDimensions(info.Width, info.Height);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <inheritdoc />
|
|
|
|
|
/// <exception cref="ArgumentNullException">The path is null.</exception>
|
|
|
|
|
@ -253,12 +215,7 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (HasDiacritics(path))
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
return HasDiacritics(path);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private string NormalizePath(string path)
|
|
|
|
|
@ -283,25 +240,17 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
return SKEncodedOrigin.TopLeft;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (orientation.Value)
|
|
|
|
|
{
|
|
|
|
|
case ImageOrientation.TopRight:
|
|
|
|
|
return SKEncodedOrigin.TopRight;
|
|
|
|
|
case ImageOrientation.RightTop:
|
|
|
|
|
return SKEncodedOrigin.RightTop;
|
|
|
|
|
case ImageOrientation.RightBottom:
|
|
|
|
|
return SKEncodedOrigin.RightBottom;
|
|
|
|
|
case ImageOrientation.LeftTop:
|
|
|
|
|
return SKEncodedOrigin.LeftTop;
|
|
|
|
|
case ImageOrientation.LeftBottom:
|
|
|
|
|
return SKEncodedOrigin.LeftBottom;
|
|
|
|
|
case ImageOrientation.BottomRight:
|
|
|
|
|
return SKEncodedOrigin.BottomRight;
|
|
|
|
|
case ImageOrientation.BottomLeft:
|
|
|
|
|
return SKEncodedOrigin.BottomLeft;
|
|
|
|
|
default:
|
|
|
|
|
return SKEncodedOrigin.TopLeft;
|
|
|
|
|
}
|
|
|
|
|
return orientation.Value switch
|
|
|
|
|
{
|
|
|
|
|
ImageOrientation.TopRight => SKEncodedOrigin.TopRight,
|
|
|
|
|
ImageOrientation.RightTop => SKEncodedOrigin.RightTop,
|
|
|
|
|
ImageOrientation.RightBottom => SKEncodedOrigin.RightBottom,
|
|
|
|
|
ImageOrientation.LeftTop => SKEncodedOrigin.LeftTop,
|
|
|
|
|
ImageOrientation.LeftBottom => SKEncodedOrigin.LeftBottom,
|
|
|
|
|
ImageOrientation.BottomRight => SKEncodedOrigin.BottomRight,
|
|
|
|
|
ImageOrientation.BottomLeft => SKEncodedOrigin.BottomLeft,
|
|
|
|
|
_ => SKEncodedOrigin.TopLeft
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
@ -323,8 +272,7 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
|
|
|
|
|
if (requiresTransparencyHack || forceCleanBitmap)
|
|
|
|
|
{
|
|
|
|
|
using (var codec = SKCodec.Create(NormalizePath(path)))
|
|
|
|
|
{
|
|
|
|
|
using var codec = SKCodec.Create(NormalizePath(path));
|
|
|
|
|
if (codec == null)
|
|
|
|
|
{
|
|
|
|
|
origin = GetSKEncodedOrigin(orientation);
|
|
|
|
|
@ -341,7 +289,6 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
|
|
|
|
|
return bitmap;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var resultBitmap = SKBitmap.Decode(NormalizePath(path));
|
|
|
|
|
|
|
|
|
|
@ -367,15 +314,8 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
{
|
|
|
|
|
if (cropWhitespace)
|
|
|
|
|
{
|
|
|
|
|
using (var bitmap = Decode(path, forceAnalyzeBitmap, orientation, out origin))
|
|
|
|
|
{
|
|
|
|
|
if (bitmap == null)
|
|
|
|
|
{
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return CropWhiteSpace(bitmap);
|
|
|
|
|
}
|
|
|
|
|
using var bitmap = Decode(path, forceAnalyzeBitmap, orientation, out origin);
|
|
|
|
|
return bitmap == null ? null : CropWhiteSpace(bitmap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return Decode(path, forceAnalyzeBitmap, orientation, out origin);
|
|
|
|
|
@ -403,135 +343,57 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
|
|
|
|
|
private SKBitmap OrientImage(SKBitmap bitmap, SKEncodedOrigin origin)
|
|
|
|
|
{
|
|
|
|
|
switch (origin)
|
|
|
|
|
{
|
|
|
|
|
case SKEncodedOrigin.TopRight:
|
|
|
|
|
if (origin == SKEncodedOrigin.Default)
|
|
|
|
|
{
|
|
|
|
|
var rotated = new SKBitmap(bitmap.Width, bitmap.Height);
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
{
|
|
|
|
|
surface.Translate(rotated.Width, 0);
|
|
|
|
|
surface.Scale(-1, 1);
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
return bitmap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rotated;
|
|
|
|
|
}
|
|
|
|
|
var needsFlip = origin == SKEncodedOrigin.LeftBottom
|
|
|
|
|
|| origin == SKEncodedOrigin.LeftTop
|
|
|
|
|
|| origin == SKEncodedOrigin.RightBottom
|
|
|
|
|
|| origin == SKEncodedOrigin.RightTop;
|
|
|
|
|
var rotated = needsFlip
|
|
|
|
|
? new SKBitmap(bitmap.Height, bitmap.Width)
|
|
|
|
|
: new SKBitmap(bitmap.Width, bitmap.Height);
|
|
|
|
|
using var surface = new SKCanvas(rotated);
|
|
|
|
|
var midX = (float)rotated.Width / 2;
|
|
|
|
|
var midY = (float)rotated.Height / 2;
|
|
|
|
|
|
|
|
|
|
case SKEncodedOrigin.BottomRight:
|
|
|
|
|
{
|
|
|
|
|
var rotated = new SKBitmap(bitmap.Width, bitmap.Height);
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
switch (origin)
|
|
|
|
|
{
|
|
|
|
|
float px = (float)bitmap.Width / 2;
|
|
|
|
|
float py = (float)bitmap.Height / 2;
|
|
|
|
|
|
|
|
|
|
surface.RotateDegrees(180, px, py);
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rotated;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SKEncodedOrigin.TopRight:
|
|
|
|
|
surface.Scale(-1, 1, midX, midY);
|
|
|
|
|
break;
|
|
|
|
|
case SKEncodedOrigin.BottomRight:
|
|
|
|
|
surface.RotateDegrees(180, midX, midY);
|
|
|
|
|
break;
|
|
|
|
|
case SKEncodedOrigin.BottomLeft:
|
|
|
|
|
{
|
|
|
|
|
var rotated = new SKBitmap(bitmap.Width, bitmap.Height);
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
{
|
|
|
|
|
float px = (float)bitmap.Width / 2;
|
|
|
|
|
|
|
|
|
|
float py = (float)bitmap.Height / 2;
|
|
|
|
|
|
|
|
|
|
surface.Translate(rotated.Width, 0);
|
|
|
|
|
surface.Scale(-1, 1);
|
|
|
|
|
|
|
|
|
|
surface.RotateDegrees(180, px, py);
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rotated;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
surface.Scale(1, -1, midX, midY);
|
|
|
|
|
break;
|
|
|
|
|
case SKEncodedOrigin.LeftTop:
|
|
|
|
|
{
|
|
|
|
|
// TODO: Remove dual canvases, had trouble with flipping
|
|
|
|
|
using (var rotated = new SKBitmap(bitmap.Height, bitmap.Width))
|
|
|
|
|
{
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
{
|
|
|
|
|
surface.Translate(rotated.Width, 0);
|
|
|
|
|
|
|
|
|
|
surface.RotateDegrees(90);
|
|
|
|
|
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var flippedBitmap = new SKBitmap(rotated.Width, rotated.Height);
|
|
|
|
|
using (var flippedCanvas = new SKCanvas(flippedBitmap))
|
|
|
|
|
{
|
|
|
|
|
flippedCanvas.Translate(flippedBitmap.Width, 0);
|
|
|
|
|
flippedCanvas.Scale(-1, 1);
|
|
|
|
|
flippedCanvas.DrawBitmap(rotated, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return flippedBitmap;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
surface.Translate(0, -rotated.Height);
|
|
|
|
|
surface.Scale(1, -1, midX, midY);
|
|
|
|
|
surface.RotateDegrees(-90);
|
|
|
|
|
break;
|
|
|
|
|
case SKEncodedOrigin.RightTop:
|
|
|
|
|
{
|
|
|
|
|
var rotated = new SKBitmap(bitmap.Height, bitmap.Width);
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
{
|
|
|
|
|
surface.Translate(rotated.Width, 0);
|
|
|
|
|
surface.RotateDegrees(90);
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rotated;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
case SKEncodedOrigin.RightBottom:
|
|
|
|
|
{
|
|
|
|
|
// TODO: Remove dual canvases, had trouble with flipping
|
|
|
|
|
using (var rotated = new SKBitmap(bitmap.Height, bitmap.Width))
|
|
|
|
|
{
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
{
|
|
|
|
|
surface.Translate(0, rotated.Height);
|
|
|
|
|
surface.RotateDegrees(270);
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var flippedBitmap = new SKBitmap(rotated.Width, rotated.Height);
|
|
|
|
|
using (var flippedCanvas = new SKCanvas(flippedBitmap))
|
|
|
|
|
{
|
|
|
|
|
flippedCanvas.Translate(flippedBitmap.Width, 0);
|
|
|
|
|
flippedCanvas.Scale(-1, 1);
|
|
|
|
|
flippedCanvas.DrawBitmap(rotated, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return flippedBitmap;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
surface.Translate(rotated.Width, 0);
|
|
|
|
|
surface.Scale(1, -1, midX, midY);
|
|
|
|
|
surface.RotateDegrees(90);
|
|
|
|
|
break;
|
|
|
|
|
case SKEncodedOrigin.LeftBottom:
|
|
|
|
|
{
|
|
|
|
|
var rotated = new SKBitmap(bitmap.Height, bitmap.Width);
|
|
|
|
|
using (var surface = new SKCanvas(rotated))
|
|
|
|
|
{
|
|
|
|
|
surface.Translate(0, rotated.Height);
|
|
|
|
|
surface.RotateDegrees(270);
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
surface.RotateDegrees(-90);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
surface.DrawBitmap(bitmap, 0, 0);
|
|
|
|
|
return rotated;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default: return bitmap;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
public string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat selectedOutputFormat)
|
|
|
|
|
{
|
|
|
|
|
@ -552,8 +414,7 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
var blur = options.Blur ?? 0;
|
|
|
|
|
var hasIndicator = options.AddPlayedIndicator || options.UnplayedCount.HasValue || !options.PercentPlayed.Equals(0);
|
|
|
|
|
|
|
|
|
|
using (var bitmap = GetBitmap(inputPath, options.CropWhiteSpace, autoOrient, orientation))
|
|
|
|
|
{
|
|
|
|
|
using var bitmap = GetBitmap(inputPath, options.CropWhiteSpace, autoOrient, orientation);
|
|
|
|
|
if (bitmap == null)
|
|
|
|
|
{
|
|
|
|
|
throw new InvalidDataException($"Skia unable to read image {inputPath}");
|
|
|
|
|
@ -574,8 +435,7 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
var width = newImageSize.Width;
|
|
|
|
|
var height = newImageSize.Height;
|
|
|
|
|
|
|
|
|
|
using (var resizedBitmap = new SKBitmap(width, height, bitmap.ColorType, bitmap.AlphaType))
|
|
|
|
|
{
|
|
|
|
|
using var resizedBitmap = new SKBitmap(width, height, bitmap.ColorType, bitmap.AlphaType);
|
|
|
|
|
// scale image
|
|
|
|
|
bitmap.ScalePixels(resizedBitmap, SKFilterQuality.High);
|
|
|
|
|
|
|
|
|
|
@ -583,18 +443,15 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
if (!hasBackgroundColor && !hasForegroundColor && blur == 0 && !hasIndicator)
|
|
|
|
|
{
|
|
|
|
|
Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
|
|
|
|
|
using (var outputStream = new SKFileWStream(outputPath))
|
|
|
|
|
using (var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels()))
|
|
|
|
|
{
|
|
|
|
|
using var outputStream = new SKFileWStream(outputPath);
|
|
|
|
|
using var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels());
|
|
|
|
|
pixmap.Encode(outputStream, skiaOutputFormat, quality);
|
|
|
|
|
return outputPath;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// create bitmap to use for canvas drawing used to draw into bitmap
|
|
|
|
|
using (var saveBitmap = new SKBitmap(width, height)) // , bitmap.ColorType, bitmap.AlphaType))
|
|
|
|
|
using (var canvas = new SKCanvas(saveBitmap))
|
|
|
|
|
{
|
|
|
|
|
using var saveBitmap = new SKBitmap(width, height);
|
|
|
|
|
using var canvas = new SKCanvas(saveBitmap);
|
|
|
|
|
// set background color if present
|
|
|
|
|
if (hasBackgroundColor)
|
|
|
|
|
{
|
|
|
|
|
@ -605,13 +462,11 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
if (blur > 0)
|
|
|
|
|
{
|
|
|
|
|
// create image from resized bitmap to apply blur
|
|
|
|
|
using (var paint = new SKPaint())
|
|
|
|
|
using (var filter = SKImageFilter.CreateBlur(blur, blur))
|
|
|
|
|
{
|
|
|
|
|
using var paint = new SKPaint();
|
|
|
|
|
using var filter = SKImageFilter.CreateBlur(blur, blur);
|
|
|
|
|
paint.ImageFilter = filter;
|
|
|
|
|
canvas.DrawBitmap(resizedBitmap, SKRect.Create(width, height), paint);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// draw resized bitmap onto canvas
|
|
|
|
|
@ -642,9 +497,6 @@ namespace Jellyfin.Drawing.Skia
|
|
|
|
|
pixmap.Encode(outputStream, skiaOutputFormat, quality);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return outputPath;
|
|
|
|
|
}
|
|
|
|
|
|
Nyanmisaka
4 years ago
committed by
GitHub