Fix the SKImage.FromPicture implementation (#3231)

* Update the externals to fix C++ API

Fixes #3157

* Update the externals to get the new API

* the colorspace is NOT optional it seems

Author: mattleibow

binding/SkiaSharp/SKImage.cs

@@ -330,24 +330,26 @@ public static SKImage FromAdoptedTexture (GRRecordingContext context, GRBackendT
 		// create a new image from a picture
 
 		public static SKImage FromPicture (SKPicture picture, SKSizeI dimensions) =>
-			FromPicture (picture, dimensions, null, null, false, null, null);
+			FromPicture (picture, dimensions, null, null, false, SKColorSpace.CreateSrgb (), null);
 
 		public static SKImage FromPicture (SKPicture picture, SKSizeI dimensions, SKMatrix matrix) =>
-			FromPicture (picture, dimensions, &matrix, null, false, null, null);
+			FromPicture (picture, dimensions, &matrix, null, false, SKColorSpace.CreateSrgb (), null);
 
 		public static SKImage FromPicture (SKPicture picture, SKSizeI dimensions, SKPaint paint) =>
-			FromPicture (picture, dimensions, null, paint, false, null, null);
+			FromPicture (picture, dimensions, null, paint, false, SKColorSpace.CreateSrgb (), null);
 
 		public static SKImage FromPicture (SKPicture picture, SKSizeI dimensions, SKMatrix matrix, SKPaint paint) =>
-			FromPicture (picture, dimensions, &matrix, paint, false, null, null);
+			FromPicture (picture, dimensions, &matrix, paint, false, SKColorSpace.CreateSrgb (), null);
 
 		private static SKImage FromPicture (SKPicture picture, SKSizeI dimensions, SKMatrix* matrix, SKPaint paint, bool useFloatingPointBitDepth, SKColorSpace colorspace, SKSurfaceProperties props)
 		{
 			if (picture == null)
 				throw new ArgumentNullException (nameof (picture));
 
 			var p = paint?.Handle ?? IntPtr.Zero;
-			return GetObject (SkiaApi.sk_image_new_from_picture (picture.Handle, &dimensions, matrix, p, useFloatingPointBitDepth, colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero));
+			var cs = colorspace?.Handle ?? IntPtr.Zero;
+			var prps = props?.Handle ?? IntPtr.Zero;
+			return GetObject (SkiaApi.sk_image_new_from_picture (picture.Handle, &dimensions, matrix, p, useFloatingPointBitDepth, cs, prps));
 		}
 
 		public SKData Encode ()

externals/skia

@@ -925,5 +925,18 @@ public void CannotCreateRawShaderWithBicubicSampling()
 			using var shader = image.ToRawShader(SKShaderTileMode.Clamp, SKShaderTileMode.Clamp, sampling);
 			Assert.Null(shader);
 		}
+
+		[SkippableFact]
+		public void FromPictureDoesNotCrash()
+		{
+			using var picture = CreateTestPicture();
+
+			using var image = SKImage.FromPicture(picture, new SKSizeI(40, 40));
+
+			using var data = image.Encode(SKEncodedImageFormat.Png, 100);
+			using var bmp = SKBitmap.Decode(data);
+			
+			ValidateTestBitmap(bmp);
+		}
 	}
 }

tests/Tests/SkiaSharp/SKImageTest.cs

@@ -139,7 +139,7 @@ protected static SKPicture CreateTestPicture(byte alpha = 255)
 			return recorder.EndRecording();
 		}
 
-		private static void DrawTestBitmap(SKCanvas canvas, int width, int height, byte alpha = 255)
+		protected static void DrawTestBitmap(SKCanvas canvas, int width, int height, byte alpha = 255)
 		{
 			using var paint = new SKPaint();