More Span<T> and ReadOnlySpan<T>

binding/SkiaSharp.Resources/ResourceProvider.cs

@@ -57,7 +57,10 @@ public FileResourceProvider (string baseDirectory, bool preDecode = false)
 
 		private static IntPtr Create (string baseDirectory, bool preDecode)
 		{
-			using var baseDir = new SKString(baseDirectory ?? throw new ArgumentNullException (nameof (baseDirectory)));
+			if (baseDirectory == null)
+				throw new ArgumentNullException (nameof (baseDirectory));
+
+			using var baseDir = new SKString (baseDirectory.AsSpan ());
 			return ResourcesApi.skresources_file_resource_provider_make (baseDir.Handle, preDecode);
 		}
 	}

binding/SkiaSharp/SKCodec.cs

@@ -101,6 +101,14 @@ public SKCodecResult GetPixels (SKImageInfo info, out byte[] pixels)
 		}
 
 		public SKCodecResult GetPixels (SKImageInfo info, byte[] pixels)
+		{
+			if (pixels == null)
+				throw new ArgumentNullException (nameof (pixels));
+
+			return GetPixels (info, pixels.AsSpan ());
+		}
+
+		public SKCodecResult GetPixels (SKImageInfo info, Span<byte> pixels)
 		{
 			if (pixels == null)
 				throw new ArgumentNullException (nameof (pixels));

binding/SkiaSharp/SKColorFilter.cs

@@ -98,12 +98,8 @@ public static SKColorFilter CreateLumaColor()
 			return GetObject (SkiaApi.sk_colorfilter_new_luma_color());
 		}
 
-		public static SKColorFilter CreateTable(byte[] table)
-		{
-			if (table == null)
-				throw new ArgumentNullException(nameof(table));
-			return CreateTable(table.AsSpan());
-		}
+		public static SKColorFilter CreateTable (byte[] table) =>
+			CreateTable (table.AsSpan ());
 
 		public static SKColorFilter CreateTable(ReadOnlySpan<byte> table)
 		{
@@ -114,18 +110,8 @@ public static SKColorFilter CreateTable(ReadOnlySpan<byte> table)
 			}
 		}
 
-		public static SKColorFilter CreateTable(byte[] tableA, byte[] tableR, byte[] tableG, byte[] tableB)
-		{
-			if (tableA == null)
-				throw new ArgumentNullException(nameof(tableA));
-			if (tableR == null)
-				throw new ArgumentNullException(nameof(tableR));
-			if (tableG == null)
-				throw new ArgumentNullException(nameof(tableG));
-			if (tableB == null)
-				throw new ArgumentNullException(nameof(tableB));
-			return CreateTable(tableA.AsSpan(), tableR.AsSpan(), tableG.AsSpan(), tableB.AsSpan());
-		}
+		public static SKColorFilter CreateTable(byte[] tableA, byte[] tableR, byte[] tableG, byte[] tableB) =>
+			CreateTable(tableA.AsSpan(), tableR.AsSpan(), tableG.AsSpan(), tableB.AsSpan());
 
 		public static SKColorFilter CreateTable(ReadOnlySpan<byte> tableA, ReadOnlySpan<byte> tableR, ReadOnlySpan<byte> tableG, ReadOnlySpan<byte> tableB)
 		{

binding/SkiaSharp/SKColorSpace.cs

@@ -78,7 +78,10 @@ public static bool Equal (SKColorSpace left, SKColorSpace right)
 		public static SKColorSpace CreateIcc (IntPtr input, long length) =>
 			CreateIcc (SKColorSpaceIccProfile.Create (input, length));
 
-		public static SKColorSpace CreateIcc (byte[] input, long length)
+		public static SKColorSpace CreateIcc (byte[] input, long length) =>
+			CreateIcc (input.AsSpan (), length);
+
+		public static SKColorSpace CreateIcc (ReadOnlySpan<byte> input, long length)
 		{
 			if (input == null)
 				throw new ArgumentNullException (nameof (input));

binding/SkiaSharp/SKColorSpaceStructs.cs

@@ -10,9 +10,12 @@ public unsafe partial struct SKColorSpacePrimaries
 		public static readonly SKColorSpacePrimaries Empty;
 
 		public SKColorSpacePrimaries (float[] values)
+			: this (new ReadOnlySpan<float> (values))
+		{
+		}
+
+		public SKColorSpacePrimaries (ReadOnlySpan<float> values)
 		{
-			if (values == null)
-				throw new ArgumentNullException (nameof (values));
 			if (values.Length != 8)
 				throw new ArgumentException ("The values must have exactly 8 items, one for each of [RX, RY, GX, GY, BX, BY, WX, WY].", nameof (values));
 
@@ -41,6 +44,36 @@ public SKColorSpacePrimaries (float rx, float ry, float gx, float gy, float bx,
 		public readonly float[] Values =>
 			new[] { fRX, fRY, fGX, fGY, fBX, fBY, fWX, fWY };
 
+		public readonly void GetValues (Span<float> values)
+		{
+			if (values.Length != 8)
+				throw new ArgumentException ("The values must have exactly 8 items, one for each of [RX, RY, GX, GY, BX, BY, WX, WY].", nameof (values));
+
+			values[0] = fRX;
+			values[1] = fRY;
+			values[2] = fGX;
+			values[3] = fGY;
+			values[4] = fBX;
+			values[5] = fBY;
+			values[6] = fWX;
+			values[7] = fWY;
+		}
+
+		public void SetValues (ReadOnlySpan<float> values)
+		{
+			if (values.Length != 8)
+				throw new ArgumentException ("The values must have exactly 8 items, one for each of [RX, RY, GX, GY, BX, BY, WX, WY].", nameof (values));
+
+			fRX = values[0];
+			fRY = values[1];
+			fGX = values[2];
+			fGY = values[3];
+			fBX = values[4];
+			fBY = values[5];
+			fWX = values[6];
+			fWY = values[7];
+		}
+
 		public readonly bool ToColorSpaceXyz (out SKColorSpaceXyz toXyzD50)
 		{
 			fixed (SKColorSpacePrimaries* t = &this)
@@ -106,9 +139,12 @@ public static SKColorSpaceTransferFn Hlg {
 		public static readonly SKColorSpaceTransferFn Empty;
 
 		public SKColorSpaceTransferFn (float[] values)
+			: this (new ReadOnlySpan<float> (values))
+		{
+		}
+
+		public SKColorSpaceTransferFn (ReadOnlySpan<float> values)
 		{
-			if (values == null)
-				throw new ArgumentNullException (nameof (values));
 			if (values.Length != 7)
 				throw new ArgumentException ("The values must have exactly 7 items, one for each of [G, A, B, C, D, E, F].", nameof (values));
 
@@ -135,6 +171,35 @@ public SKColorSpaceTransferFn (float g, float a, float b, float c, float d, floa
 		public readonly float[] Values =>
 			new[] { fG, fA, fB, fC, fD, fE, fF };
 
+
+		public readonly void GetValues (Span<float> values)
+		{
+			if (values.Length != 7)
+				throw new ArgumentException ("The values must have exactly 7 items, one for each of [G, A, B, C, D, E, F].", nameof (values));
+
+			values[0] = fG;
+			values[1] = fA;
+			values[2] = fB;
+			values[3] = fC;
+			values[4] = fD;
+			values[5] = fE;
+			values[6] = fF;
+		}
+
+		public void SetValues (ReadOnlySpan<float> values)
+		{
+			if (values.Length != 7)
+				throw new ArgumentException ("The values must have exactly 7 items, one for each of [G, A, B, C, D, E, F].", nameof (values));
+
+			fG = values[0];
+			fA = values[1];
+			fB = values[2];
+			fC = values[3];
+			fD = values[4];
+			fE = values[5];
+			fF = values[6];
+		}
+
 		public readonly SKColorSpaceTransferFn Invert ()
 		{
 			SKColorSpaceTransferFn inverted;
@@ -218,11 +283,14 @@ public SKColorSpaceXyz (float value)
 		}
 
 		public SKColorSpaceXyz (float[] values)
+			: this (new ReadOnlySpan<float> (values))
+		{
+		}
+
+		public SKColorSpaceXyz (ReadOnlySpan<float> values)
 		{
-			if (values == null)
-				throw new ArgumentNullException (nameof (values));
 			if (values.Length != 9)
-				throw new ArgumentException ("The matrix array must have a length of 9.", nameof (values));
+				throw new ArgumentException ("The values must have a length of 9.", nameof (values));
 
 			fM00 = values[0];
 			fM01 = values[1];
@@ -261,22 +329,43 @@ public float[] Values {
 				fM10, fM11, fM12,
 				fM20, fM21, fM22,
 			};
-			set {
-				if (value.Length != 9)
-					throw new ArgumentException ("The matrix array must have a length of 9.", nameof (value));
+			set => SetValues (new ReadOnlySpan<float> (value));
+		}
 
-				fM00 = value[0];
-				fM01 = value[1];
-				fM02 = value[2];
+		public readonly void GetValues (Span<float> values)
+		{
+			if (values.Length != 9)
+				throw new ArgumentException ("The values must have a length of 9.", nameof(values));
 
-				fM10 = value[3];
-				fM11 = value[4];
-				fM12 = value[5];
+			values[0] = fM00;
+			values[1] = fM01;
+			values[2] = fM02;
 
-				fM20 = value[6];
-				fM21 = value[7];
-				fM22 = value[8];
-			}
+			values[3] = fM10;
+			values[4] = fM11;
+			values[5] = fM12;
+
+			values[6] = fM20;
+			values[7] = fM21;
+			values[8] = fM22;
+		}
+
+		public void SetValues (ReadOnlySpan<float> values)
+		{
+			if (values.Length != 9)
+				throw new ArgumentException ("The values must have a length of 9.", nameof(values));
+
+			fM00 = values[0];
+			fM01 = values[1];
+			fM02 = values[2];
+
+			fM10 = values[3];
+			fM11 = values[4];
+			fM12 = values[5];
+
+			fM20 = values[6];
+			fM21 = values[7];
+			fM22 = values[8];
 		}
 
 		public readonly float this[int x, int y] {

binding/SkiaSharp/SKData.cs

@@ -63,16 +63,15 @@ public static SKData CreateCopy (IntPtr bytes, ulong length)
 		}
 
 		public static SKData CreateCopy (byte[] bytes) =>
+			CreateCopy (bytes.AsSpan ());
+
+		public static SKData CreateCopy (ReadOnlySpan<byte> bytes) =>
 			CreateCopy (bytes, (ulong)bytes.Length);
 
-		public static SKData CreateCopy (byte[] bytes, ulong length)
-		{
-			fixed (byte* b = bytes) {
-				return GetObject (SkiaApi.sk_data_new_with_copy (b, (IntPtr)length));
-			}
-		}
+		public static SKData CreateCopy (byte[] bytes, ulong length) =>
+			CreateCopy (bytes.AsSpan (), length);
 
-		public static SKData CreateCopy (ReadOnlySpan<byte> bytes)
+		public static SKData CreateCopy (ReadOnlySpan<byte> bytes, ulong length)
 		{
 			fixed (byte* b = bytes) {
 				return CreateCopy ((IntPtr)b, (ulong)bytes.Length);
@@ -212,9 +211,9 @@ public static SKData Create (IntPtr address, int length, SKDataReleaseDelegate r
 			return GetObject (SkiaApi.sk_data_new_with_proc ((void*)address, (IntPtr)length, proxy, (void*)ctx));
 		}
 
-		internal static SKData FromCString (string str)
+		internal static SKData FromCString (ReadOnlySpan<char> str)
 		{
-			var bytes = Encoding.ASCII.GetBytes (str ?? string.Empty);
+			var bytes = Encoding.ASCII.GetBytes (str);
 			return SKData.CreateCopy (bytes, (ulong)(bytes.Length + 1)); // + 1 for the terminating char
 		}
 

binding/SkiaSharp/SKDocument.cs

@@ -139,12 +139,12 @@ public static SKDocument CreatePdf (SKWStream stream, SKDocumentPdfMetadata meta
 				throw new ArgumentNullException (nameof (stream));
 			}
 
-			using var title = SKString.Create (metadata.Title);
-			using var author = SKString.Create (metadata.Author);
-			using var subject = SKString.Create (metadata.Subject);
-			using var keywords = SKString.Create (metadata.Keywords);
-			using var creator = SKString.Create (metadata.Creator);
-			using var producer = SKString.Create (metadata.Producer);
+			using var title = SKString.Create (metadata.Title.AsSpan ());
+			using var author = SKString.Create (metadata.Author.AsSpan ());
+			using var subject = SKString.Create (metadata.Subject.AsSpan ());
+			using var keywords = SKString.Create (metadata.Keywords.AsSpan ());
+			using var creator = SKString.Create (metadata.Creator.AsSpan ());
+			using var producer = SKString.Create (metadata.Producer.AsSpan ());
 
 			var cmetadata = new SKDocumentPdfMetadataInternal {
 				fTitle = title?.Handle ?? IntPtr.Zero,

binding/SkiaSharp/SKFont.cs

@@ -188,11 +188,11 @@ public void GetGlyphs (IntPtr text, int length, SKTextEncoding encoding, Span<us
 		internal ushort[] GetGlyphs (void* text, int length, SKTextEncoding encoding)
 		{
 			if (!ValidateTextArgs (text, length, encoding))
-				return new ushort[0];
+				return Array.Empty<ushort> ();
 
 			var n = CountGlyphs (text, length, encoding);
 			if (n <= 0)
-				return new ushort[0];
+				return Array.Empty<ushort> ();
 
 			var glyphs = new ushort[n];
 			GetGlyphs (text, length, encoding, glyphs);
@@ -232,7 +232,10 @@ public bool ContainsGlyphs (IntPtr text, int length, SKTextEncoding encoding) =>
 			ContainsGlyphs (GetGlyphs (text, length, encoding));
 
 		private bool ContainsGlyphs (ushort[] glyphs) =>
-			Array.IndexOf (glyphs, (ushort)0) == -1;
+			ContainsGlyphs (glyphs.AsSpan ());
+
+		private bool ContainsGlyphs (ReadOnlySpan<ushort> glyphs) =>
+			glyphs.IndexOf ((ushort)0) == -1;
 
 		// CountGlyphs
 
@@ -433,11 +436,11 @@ public void GetGlyphPositions (IntPtr text, int length, SKTextEncoding encoding,
 		internal SKPoint[] GetGlyphPositions (void* text, int length, SKTextEncoding encoding, SKPoint origin)
 		{
 			if (!ValidateTextArgs (text, length, encoding))
-				return new SKPoint[0];
+				return Array.Empty<SKPoint> ();
 
 			var n = CountGlyphs (text, length, encoding);
 			if (n <= 0)
-				return new SKPoint[0];
+				return Array.Empty<SKPoint> ();
 
 			var positions = new SKPoint[n];
 			GetGlyphPositions (text, length, encoding, positions, origin);
@@ -523,11 +526,11 @@ public void GetGlyphOffsets (IntPtr text, int length, SKTextEncoding encoding, S
 		internal float[] GetGlyphOffsets (void* text, int length, SKTextEncoding encoding, float origin)
 		{
 			if (!ValidateTextArgs (text, length, encoding))
-				return new float[0];
+				return Array.Empty<float> ();
 
 			var n = CountGlyphs (text, length, encoding);
 			if (n <= 0)
-				return new float[0];
+				return Array.Empty<float> ();
 
 			var offsets = new float[n];
 			GetGlyphOffsets (text, length, encoding, offsets, origin);
@@ -633,11 +636,11 @@ public void GetGlyphWidths (IntPtr text, int length, SKTextEncoding encoding, Sp
 		internal float[] GetGlyphWidths (void* text, int length, SKTextEncoding encoding, SKPaint paint)
 		{
 			if (!ValidateTextArgs (text, length, encoding))
-				return new float[0];
+				return Array.Empty<float> ();
 
 			var n = CountGlyphs (text, length, encoding);
 			if (n <= 0)
-				return new float[0];
+				return Array.Empty<float> ();
 
 			var widths = new float[n];
 			GetGlyphWidths (text, length, encoding, widths, Span<SKRect>.Empty, paint);
@@ -647,14 +650,14 @@ internal float[] GetGlyphWidths (void* text, int length, SKTextEncoding encoding
 		internal float[] GetGlyphWidths (void* text, int length, SKTextEncoding encoding, out SKRect[] bounds, SKPaint paint)
 		{
 			if (!ValidateTextArgs (text, length, encoding)) {
-				bounds = new SKRect[0];
-				return new float[0];
+				bounds = Array.Empty<SKRect> ();
+				return Array.Empty<float> ();
 			}
 
 			var n = CountGlyphs (text, length, encoding);
 			if (n <= 0) {
-				bounds = new SKRect[0];
-				return new float[0];
+				bounds = Array.Empty<SKRect> ();
+				return Array.Empty<float> ();
 			}
 
 			bounds = new SKRect[n];