add skia error handling

This commit is contained in:
Luke Pulverenti 2017-06-24 14:29:23 -04:00
parent 023952d04d
commit bcaf9bd19c
2 changed files with 9 additions and 4 deletions

View File

@ -63,15 +63,15 @@ namespace Emby.Drawing.Skia
private void LogVersion() private void LogVersion()
{ {
// test an operation that requires the native library
SKPMColor.PreMultiply(SKColors.Black);
_logger.Info("SkiaSharp version: " + GetVersion()); _logger.Info("SkiaSharp version: " + GetVersion());
} }
public static string GetVersion() public static string GetVersion()
{ {
using (var bitmap = new SKBitmap()) return typeof(SKBitmap).GetTypeInfo().Assembly.GetName().Version.ToString();
{
return typeof(SKBitmap).GetTypeInfo().Assembly.GetName().Version.ToString();
}
} }
private static bool IsWhiteSpace(SKColor color) private static bool IsWhiteSpace(SKColor color)

View File

@ -410,6 +410,11 @@ namespace Emby.Drawing
return GetCachePath(ResizedImageCachePath, filename, "." + format.ToString().ToLower()); return GetCachePath(ResizedImageCachePath, filename, "." + format.ToString().ToLower());
} }
public ImageSize GetImageSize(ItemImageInfo info, bool allowSlowMethods)
{
return GetImageSize(info.Path, info.DateModified, allowSlowMethods);
}
public ImageSize GetImageSize(ItemImageInfo info) public ImageSize GetImageSize(ItemImageInfo info)
{ {
return GetImageSize(info.Path, info.DateModified, false); return GetImageSize(info.Path, info.DateModified, false);