From 32502d041b96fde7bb316db73b90a6a8a49fc37a Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Tue, 28 Jan 2020 02:30:23 +0100 Subject: [PATCH] adjust names --- ...p{T}.External.cs => UniformMemoryGroup{T}.Consumed.cs} | 5 +++-- ...oup{T}.Allocated.cs => UniformMemoryGroup{T}.Owned.cs} | 5 +++-- .../Memory/DiscontinuousProto/UniformMemoryGroup{T}.cs | 8 +++++++- 3 files changed, 13 insertions(+), 5 deletions(-) rename src/ImageSharp/Memory/DiscontinuousProto/{UniformMemoryGroup{T}.External.cs => UniformMemoryGroup{T}.Consumed.cs} (83%) rename src/ImageSharp/Memory/DiscontinuousProto/{UniformMemoryGroup{T}.Allocated.cs => UniformMemoryGroup{T}.Owned.cs} (91%) diff --git a/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.External.cs b/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Consumed.cs similarity index 83% rename from src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.External.cs rename to src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Consumed.cs index 024b42a3c..79c2853b3 100644 --- a/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.External.cs +++ b/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Consumed.cs @@ -5,11 +5,12 @@ namespace SixLabors.ImageSharp.Memory.DiscontinuousProto { public abstract partial class UniformMemoryGroup { - private class External : UniformMemoryGroup + // Analogous to the "consumed" variant of MemorySource + private class Consumed : UniformMemoryGroup { private readonly ReadOnlyMemory> source; - public External(ReadOnlyMemory> source) + public Consumed(ReadOnlyMemory> source) { // TODO: sizes should be uniform, validate! diff --git a/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Allocated.cs b/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Owned.cs similarity index 91% rename from src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Allocated.cs rename to src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Owned.cs index b9157b59d..7a5c75070 100644 --- a/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Allocated.cs +++ b/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.Owned.cs @@ -5,13 +5,14 @@ using System.Linq; namespace SixLabors.ImageSharp.Memory.DiscontinuousProto { + // Analogous to the "owned" variant of MemorySource public abstract partial class UniformMemoryGroup { - private class Allocated : UniformMemoryGroup + private class Owned : UniformMemoryGroup { private IMemoryOwner[] memoryOwners; - public Allocated(IMemoryOwner[] memoryOwners) + public Owned(IMemoryOwner[] memoryOwners) { this.memoryOwners = memoryOwners; } diff --git a/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.cs b/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.cs index 4682d6813..465384f01 100644 --- a/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.cs +++ b/src/ImageSharp/Memory/DiscontinuousProto/UniformMemoryGroup{T}.cs @@ -34,7 +34,13 @@ namespace SixLabors.ImageSharp.Memory.DiscontinuousProto public static UniformMemoryGroup Wrap(ReadOnlyMemory> source) { - return new External(source); + return new Consumed(source); + } + + // Analogous to current MemorySource.SwapOrCopyContent() + public static void SwapOrCopyContent(UniformMemoryGroup destination, UniformMemoryGroup source) + { + throw new NotImplementedException(); } } }