diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs index fc9963fecc..159e585218 100644 --- a/src/Skia/Avalonia.Skia/BitmapImpl.cs +++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs @@ -24,7 +24,7 @@ namespace Avalonia.Skia { PixelHeight = height; PixelWidth = width; - Bitmap = new SKBitmap(width, height, SKColorType.N_32, SKAlphaType.Premul); + Bitmap = new SKBitmap(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul); } public void Dispose() diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs index b1a0579e7d..1c1ebf4a08 100644 --- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs +++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs @@ -30,8 +30,8 @@ namespace Avalonia.Skia IBitmapImpl LoadBitmap(byte[] data) { - var bitmap = new SKBitmap(); - if (!SKImageDecoder.DecodeMemory(data, bitmap)) + var bitmap = SKBitmap.Decode(data); + if (bitmap == null) { throw new ArgumentException("Unable to load bitmap from provided data"); } diff --git a/src/Skia/Avalonia.Skia/RenderTarget.cs b/src/Skia/Avalonia.Skia/RenderTarget.cs index 2c2a7420a0..1e1a5ff29d 100644 --- a/src/Skia/Avalonia.Skia/RenderTarget.cs +++ b/src/Skia/Avalonia.Skia/RenderTarget.cs @@ -87,7 +87,7 @@ namespace Avalonia.Skia _bitmap.Dispose(); } - _bitmap = new SKBitmap(width, height, SKColorType.N_32, SKAlphaType.Premul); + _bitmap = new SKBitmap(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul); IntPtr length; var pixels = _bitmap.GetPixels(out length);