Ver Fonte

update skia decoding

Luke Pulverenti há 8 anos atrás
pai
commit
6eec35ecbd

+ 2 - 2
Emby.Drawing.Skia/SkiaEncoder.cs

@@ -183,8 +183,8 @@ namespace Emby.Drawing.Skia
             }
         }
 
-        private string[] TransparentImageTypes = new string[] { ".png", ".gif", ".webp" };
-        private SKBitmap Decode(string path, bool forceCleanBitmap, out SKCodecOrigin origin)
+        private static string[] TransparentImageTypes = new string[] { ".png", ".gif", ".webp" };
+        internal static SKBitmap Decode(string path, bool forceCleanBitmap, out SKCodecOrigin origin)
         {
             var requiresTransparencyHack = TransparentImageTypes.Contains(Path.GetExtension(path) ?? string.Empty);
 

+ 4 - 2
Emby.Drawing.Skia/StripCollageBuilder.cs

@@ -82,7 +82,8 @@ namespace Emby.Drawing.Skia
 
                 for (int i = 0; i < 4; i++)
                 {
-                    using (var currentBitmap = SKBitmap.Decode(paths[imageIndex]))
+                    SKCodecOrigin origin;
+                    using (var currentBitmap = SkiaEncoder.Decode(paths[imageIndex], false, out origin))
                     {
                         // resize to the same aspect as the original
                         int iWidth = (int)Math.Abs(iHeight * currentBitmap.Width / currentBitmap.Height);
@@ -163,7 +164,8 @@ namespace Emby.Drawing.Skia
                 {
                     for (var y = 0; y < 2; y++)
                     {
-                        using (var currentBitmap = SKBitmap.Decode(paths[imageIndex]))
+                        SKCodecOrigin origin;
+                        using (var currentBitmap = SkiaEncoder.Decode(paths[imageIndex], false, out origin))
                         {
                             using (var resizedBitmap = new SKBitmap(cellWidth, cellHeight, currentBitmap.ColorType, currentBitmap.AlphaType))
                             {