update skia

This commit is contained in:
Luke Pulverenti 2017-05-10 15:56:59 -04:00
parent b9baf377e8
commit 3c60445311
2 changed files with 18 additions and 3 deletions

View File

@ -192,17 +192,32 @@ namespace Emby.Drawing.Skia
} }
} }
private SKBitmap Decode(string path)
{
using (var stream = new SKFileStream(path))
{
var codec = SKCodec.Create(stream);
// create the bitmap
var bitmap = new SKBitmap(codec.Info.Width, codec.Info.Height);
// decode
codec.GetPixels(bitmap.Info, bitmap.GetPixels());
return bitmap;
}
}
private SKBitmap GetBitmap(string path, bool cropWhitespace) private SKBitmap GetBitmap(string path, bool cropWhitespace)
{ {
if (cropWhitespace) if (cropWhitespace)
{ {
using (var bitmap = SKBitmap.Decode(path)) using (var bitmap = Decode(path))
{ {
return CropWhiteSpace(bitmap); return CropWhiteSpace(bitmap);
} }
} }
return SKBitmap.Decode(path); return Decode(path);
} }
public void EncodeImage(string inputPath, string outputPath, bool autoOrient, int width, int height, int quality, ImageProcessingOptions options, ImageFormat selectedOutputFormat) public void EncodeImage(string inputPath, string outputPath, bool autoOrient, int width, int height, int quality, ImageProcessingOptions options, ImageFormat selectedOutputFormat)

View File

@ -26,7 +26,7 @@ namespace MediaBrowser.Server.Startup.Common
{ {
try try
{ {
//return new SkiaEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem); return new SkiaEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
} }
catch catch
{ {