Correctly marshal the inner struct

Author: mattleibow

binding/Binding/Definitions.cs

@@ -330,29 +330,13 @@ public enum SKTransferFunctionBehavior {
 	}
 
 
-	[StructLayout(LayoutKind.Sequential)]
+	[StructLayout (LayoutKind.Sequential)]
 	internal unsafe struct SKCodecOptionsInternal {
 		public SKZeroInitialized fZeroInitialized;
 		public SKRectI* fSubset;
 		public int fFrameIndex;
 		public int fPriorFrame;
 		public SKTransferFunctionBehavior fPremulBehavior;
-
-		public static unsafe SKCodecOptionsInternal FromManaged (ref SKCodecOptions managed)
-		{
-			var nativeOptions = new SKCodecOptionsInternal {
-				fZeroInitialized = managed.ZeroInitialized,
-				fSubset = null,
-				fFrameIndex = managed.FrameIndex,
-				fPriorFrame = managed.PriorFrame,
-				fPremulBehavior = managed.PremulBehavior,
-			};
-			if (managed.HasSubset) {
-				var subset = managed.Subset.Value;
-				nativeOptions.fSubset = ⊂
-			}
-			return nativeOptions;
-		}
 	}
 
 	public struct SKCodecOptions {

binding/Binding/SKCodec.cs

@@ -113,10 +113,22 @@ public SKCodecResult GetPixels (SKImageInfo info, IntPtr pixels, int rowBytes, S
 			if (pixels == IntPtr.Zero)
 				throw new ArgumentNullException (nameof (pixels));
 
-			var nOptions = SKCodecOptionsInternal.FromManaged (ref options);
 			var nInfo = SKImageInfoNative.FromManaged (ref info);
 
-			return SkiaApi.sk_codec_get_pixels (Handle, ref nInfo, pixels, (IntPtr)rowBytes, ref nOptions);
+			unsafe {
+				var nOptions = new SKCodecOptionsInternal {
+					fZeroInitialized = options.ZeroInitialized,
+					fSubset = null,
+					fFrameIndex = options.FrameIndex,
+					fPriorFrame = options.PriorFrame,
+					fPremulBehavior = options.PremulBehavior,
+				};
+				if (options.HasSubset) {
+					var subset = options.Subset.Value;
+					nOptions.fSubset = ⊂
+				}
+				return SkiaApi.sk_codec_get_pixels (Handle, ref nInfo, pixels, (IntPtr)rowBytes, ref nOptions);
+			}
 		}
 
 		[Obsolete ("The Index8 color type and color table is no longer supported. Use GetPixels(SKImageInfo, IntPtr, int, SKCodecOptions) instead.")]
@@ -176,10 +188,23 @@ public SKCodecResult StartIncrementalDecode (SKImageInfo info, IntPtr pixels, in
 			if (pixels == IntPtr.Zero)
 				throw new ArgumentNullException (nameof (pixels));
 
-			var nOptions = SKCodecOptionsInternal.FromManaged (ref options);
 			var nInfo = SKImageInfoNative.FromManaged (ref info);
 
-			return SkiaApi.sk_codec_start_incremental_decode (Handle, ref nInfo, pixels, (IntPtr)rowBytes, ref nOptions);
+			unsafe {
+				var nOptions = new SKCodecOptionsInternal {
+					fZeroInitialized = options.ZeroInitialized,
+					fSubset = null,
+					fFrameIndex = options.FrameIndex,
+					fPriorFrame = options.PriorFrame,
+					fPremulBehavior = options.PremulBehavior,
+				};
+				if (options.HasSubset) {
+					var subset = options.Subset.Value;
+					nOptions.fSubset = ⊂
+				}
+
+				return SkiaApi.sk_codec_start_incremental_decode (Handle, ref nInfo, pixels, (IntPtr)rowBytes, ref nOptions);
+			}
 		}
 
 		public SKCodecResult StartIncrementalDecode (SKImageInfo info, IntPtr pixels, int rowBytes)
@@ -212,10 +237,23 @@ public SKCodecResult StartScanlineDecode (SKImageInfo info, SKCodecOptions optio
 
 		public SKCodecResult StartScanlineDecode (SKImageInfo info, SKCodecOptions options)
 		{
-			var nOptions = SKCodecOptionsInternal.FromManaged (ref options);
 			var nInfo = SKImageInfoNative.FromManaged (ref info);
 
-			return SkiaApi.sk_codec_start_scanline_decode (Handle, ref nInfo, ref nOptions);
+			unsafe {
+				var nOptions = new SKCodecOptionsInternal {
+					fZeroInitialized = options.ZeroInitialized,
+					fSubset = null,
+					fFrameIndex = options.FrameIndex,
+					fPriorFrame = options.PriorFrame,
+					fPremulBehavior = options.PremulBehavior,
+				};
+				if (options.HasSubset) {
+					var subset = options.Subset.Value;
+					nOptions.fSubset = ⊂
+				}
+
+				return SkiaApi.sk_codec_start_scanline_decode (Handle, ref nInfo, ref nOptions);
+			}
 		}
 
 		public SKCodecResult StartScanlineDecode (SKImageInfo info)