diff --git a/src/ImageSharp/Formats/Bmp/BmpMetaData.cs b/src/ImageSharp/Formats/Bmp/BmpMetaData.cs
index 8b33e30fa6..134c8904b8 100644
--- a/src/ImageSharp/Formats/Bmp/BmpMetaData.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpMetaData.cs
@@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
public BmpBitsPerPixel BitsPerPixel { get; set; } = BmpBitsPerPixel.Pixel24;
///
- public IDeepCloneable DeepClone() => new BmpMetaData(this);
+ public IDeepCloneable Clone() => new BmpMetaData(this);
// TODO: Colors used once we support encoding palette bmps.
}
diff --git a/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs b/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs
index 0042c6a108..47af2bbdc0 100644
--- a/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs
+++ b/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs
@@ -49,6 +49,6 @@ namespace SixLabors.ImageSharp.Formats.Gif
public GifDisposalMethod DisposalMethod { get; set; }
///
- public IDeepCloneable DeepClone() => new GifFrameMetaData(this);
+ public IDeepCloneable Clone() => new GifFrameMetaData(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/GifMetaData.cs b/src/ImageSharp/Formats/Gif/GifMetaData.cs
index bb7fb50518..7a91a3a75e 100644
--- a/src/ImageSharp/Formats/Gif/GifMetaData.cs
+++ b/src/ImageSharp/Formats/Gif/GifMetaData.cs
@@ -45,6 +45,6 @@ namespace SixLabors.ImageSharp.Formats.Gif
public int GlobalColorTableLength { get; set; }
///
- public IDeepCloneable DeepClone() => new GifMetaData(this);
+ public IDeepCloneable Clone() => new GifMetaData(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs b/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs
index fcad29e5d0..5cef3355a0 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs
@@ -27,6 +27,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
public int Quality { get; set; } = 75;
///
- public IDeepCloneable DeepClone() => new JpegMetaData(this);
+ public IDeepCloneable Clone() => new JpegMetaData(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/PngMetaData.cs b/src/ImageSharp/Formats/Png/PngMetaData.cs
index 9c76765146..e9f0dc6c42 100644
--- a/src/ImageSharp/Formats/Png/PngMetaData.cs
+++ b/src/ImageSharp/Formats/Png/PngMetaData.cs
@@ -43,6 +43,6 @@ namespace SixLabors.ImageSharp.Formats.Png
public float Gamma { get; set; }
///
- public IDeepCloneable DeepClone() => new PngMetaData(this);
+ public IDeepCloneable Clone() => new PngMetaData(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/IDeepCloneable.cs b/src/ImageSharp/IDeepCloneable.cs
index a792fc044d..04c60a6252 100644
--- a/src/ImageSharp/IDeepCloneable.cs
+++ b/src/ImageSharp/IDeepCloneable.cs
@@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp
/// Creates a new that is a deep copy of the current instance.
///
/// The .
- T DeepClone();
+ T Clone();
}
///
@@ -26,6 +26,6 @@ namespace SixLabors.ImageSharp
/// Creates a new object that is a deep copy of the current instance.
///
/// The .
- IDeepCloneable DeepClone();
+ IDeepCloneable Clone();
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index c55d636279..59571ce92e 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -195,7 +195,7 @@ namespace SixLabors.ImageSharp
this.frames.Remove(frame);
- return new Image(this.parent.GetConfiguration(), this.parent.MetaData.DeepClone(), new[] { frame });
+ return new Image(this.parent.GetConfiguration(), this.parent.MetaData.Clone(), new[] { frame });
}
///
@@ -208,7 +208,7 @@ namespace SixLabors.ImageSharp
{
ImageFrame frame = this[index];
ImageFrame clonedFrame = frame.Clone();
- return new Image(this.parent.GetConfiguration(), this.parent.MetaData.DeepClone(), new[] { clonedFrame });
+ return new Image(this.parent.GetConfiguration(), this.parent.MetaData.Clone(), new[] { clonedFrame });
}
///
diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index dfbae817d6..132ab598e5 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp
this.MemoryAllocator = configuration.MemoryAllocator;
this.PixelBuffer = this.MemoryAllocator.Allocate2D(source.PixelBuffer.Width, source.PixelBuffer.Height);
source.PixelBuffer.GetSpan().CopyTo(this.PixelBuffer.GetSpan());
- this.MetaData = source.MetaData.DeepClone();
+ this.MetaData = source.MetaData.Clone();
}
///
@@ -260,7 +260,7 @@ namespace SixLabors.ImageSharp
return this.Clone() as ImageFrame;
}
- var target = new ImageFrame(this.configuration, this.Width, this.Height, this.MetaData.DeepClone());
+ var target = new ImageFrame(this.configuration, this.Width, this.Height, this.MetaData.Clone());
ParallelFor.WithTemporaryBuffer(
0,
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index bdb1447f29..8bc5a40bdc 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -190,7 +190,7 @@ namespace SixLabors.ImageSharp
public Image Clone()
{
IEnumerable> clonedFrames = this.frames.Select(x => x.Clone());
- return new Image(this.configuration, this.MetaData.DeepClone(), clonedFrames);
+ return new Image(this.configuration, this.MetaData.Clone(), clonedFrames);
}
///
@@ -208,7 +208,7 @@ namespace SixLabors.ImageSharp
where TPixel2 : struct, IPixel
{
IEnumerable> clonedFrames = this.frames.Select(x => x.CloneAs());
- var target = new Image(this.configuration, this.MetaData.DeepClone(), clonedFrames);
+ var target = new Image(this.configuration, this.MetaData.Clone(), clonedFrames);
return target;
}
diff --git a/src/ImageSharp/MetaData/ImageFrameMetaData.cs b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
index f1f884be68..26c717f2a4 100644
--- a/src/ImageSharp/MetaData/ImageFrameMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
@@ -33,12 +33,12 @@ namespace SixLabors.ImageSharp.MetaData
foreach (KeyValuePair meta in other.formatMetaData)
{
- this.formatMetaData.Add(meta.Key, meta.Value.DeepClone());
+ this.formatMetaData.Add(meta.Key, meta.Value.Clone());
}
}
///
- public ImageFrameMetaData DeepClone() => new ImageFrameMetaData(this);
+ public ImageFrameMetaData Clone() => new ImageFrameMetaData(this);
///
/// Gets the metadata value associated with the specified key.
diff --git a/src/ImageSharp/MetaData/ImageMetaData.cs b/src/ImageSharp/MetaData/ImageMetaData.cs
index 73549d98aa..44c1738cf0 100644
--- a/src/ImageSharp/MetaData/ImageMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageMetaData.cs
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.MetaData
foreach (KeyValuePair meta in other.formatMetaData)
{
- this.formatMetaData.Add(meta.Key, meta.Value.DeepClone());
+ this.formatMetaData.Add(meta.Key, meta.Value.Clone());
}
foreach (ImageProperty property in other.Properties)
@@ -68,8 +68,8 @@ namespace SixLabors.ImageSharp.MetaData
this.Properties.Add(property);
}
- this.ExifProfile = other.ExifProfile?.DeepClone();
- this.IccProfile = other.IccProfile?.DeepClone();
+ this.ExifProfile = other.ExifProfile?.Clone();
+ this.IccProfile = other.IccProfile?.Clone();
}
///
@@ -154,7 +154,7 @@ namespace SixLabors.ImageSharp.MetaData
}
///
- public ImageMetaData DeepClone() => new ImageMetaData(this);
+ public ImageMetaData Clone() => new ImageMetaData(this);
///
/// Looks up a property with the provided name.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
index b48b146f11..7b71a78eb9 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
@@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
foreach (ExifValue value in other.Values)
{
- this.values.Add(value.DeepClone());
+ this.values.Add(value.Clone());
}
}
@@ -242,7 +242,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
}
///
- public ExifProfile DeepClone() => new ExifProfile(this);
+ public ExifProfile Clone() => new ExifProfile(this);
///
/// Synchronizes the profiles with the specified meta data.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
index ccacfd0bf9..88827820c3 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
@@ -229,7 +229,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
}
///
- public ExifValue DeepClone() => new ExifValue(this);
+ public ExifValue Clone() => new ExifValue(this);
///
/// Creates a new
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
index 44990b7ecc..3885303d45 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
@@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
}
///
- public IccProfile DeepClone() => new IccProfile(this);
+ public IccProfile Clone() => new IccProfile(this);
#if !NETSTANDARD1_1
diff --git a/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
index a7e1589259..3993ab1a8d 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
@@ -51,10 +51,10 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
{
// We will always be creating the clone even for mutate because we may need to resize the canvas
IEnumerable> frames =
- source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.TargetDimensions, x.MetaData.DeepClone()));
+ source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.TargetDimensions, x.MetaData.Clone()));
// Use the overload to prevent an extra frame being added
- return new Image(source.GetConfiguration(), source.MetaData.DeepClone(), frames);
+ return new Image(source.GetConfiguration(), source.MetaData.Clone(), frames);
}
///
diff --git a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
index df1ac32746..0c52123755 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
@@ -36,10 +36,10 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
protected override Image CreateDestination(Image source, Rectangle sourceRectangle)
{
// We will always be creating the clone even for mutate because we may need to resize the canvas
- IEnumerable> frames = source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.CropRectangle.Width, this.CropRectangle.Height, x.MetaData.DeepClone()));
+ IEnumerable> frames = source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.CropRectangle.Width, this.CropRectangle.Height, x.MetaData.Clone()));
// Use the overload to prevent an extra frame being added
- return new Image(source.GetConfiguration(), source.MetaData.DeepClone(), frames);
+ return new Image(source.GetConfiguration(), source.MetaData.Clone(), frames);
}
///
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
index 15816cb4dd..042ce2ff6d 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
@@ -51,10 +51,10 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
{
// We will always be creating the clone even for mutate because we may need to resize the canvas
IEnumerable> frames =
- source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.TargetDimensions.Width, this.TargetDimensions.Height, x.MetaData.DeepClone()));
+ source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.TargetDimensions.Width, this.TargetDimensions.Height, x.MetaData.Clone()));
// Use the overload to prevent an extra frame being added
- return new Image(source.GetConfiguration(), source.MetaData.DeepClone(), frames);
+ return new Image(source.GetConfiguration(), source.MetaData.Clone(), frames);
}
///
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index b1c0632c66..fd3c34d6c1 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -215,10 +215,10 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
protected override Image CreateDestination(Image source, Rectangle sourceRectangle)
{
// We will always be creating the clone even for mutate because we may need to resize the canvas
- IEnumerable> frames = source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.Width, this.Height, x.MetaData.DeepClone()));
+ IEnumerable> frames = source.Frames.Select(x => new ImageFrame(source.GetConfiguration(), this.Width, this.Height, x.MetaData.Clone()));
// Use the overload to prevent an extra frame being added
- return new Image(source.GetConfiguration(), source.MetaData.DeepClone(), frames);
+ return new Image(source.GetConfiguration(), source.MetaData.Clone(), frames);
}
///
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpMetaDataTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpMetaDataTests.cs
index 991768a11a..ca36a1eb5f 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpMetaDataTests.cs
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
public void CloneIsDeep()
{
var meta = new BmpMetaData() { BitsPerPixel = BmpBitsPerPixel.Pixel24 };
- var clone = (BmpMetaData)meta.DeepClone();
+ var clone = (BmpMetaData)meta.Clone();
clone.BitsPerPixel = BmpBitsPerPixel.Pixel32;
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetaDataTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetaDataTests.cs
index a39fc47b40..4879a56739 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetaDataTests.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
ColorTableLength = 2
};
- var clone = (GifFrameMetaData)meta.DeepClone();
+ var clone = (GifFrameMetaData)meta.Clone();
clone.FrameDelay = 2;
clone.DisposalMethod = GifDisposalMethod.RestoreToPrevious;
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifMetaDataTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifMetaDataTests.cs
index 29db32b4ab..4f42753164 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifMetaDataTests.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
GlobalColorTableLength = 2
};
- var clone = (GifMetaData)meta.DeepClone();
+ var clone = (GifMetaData)meta.Clone();
clone.RepeatCount = 2;
clone.ColorTableMode = GifColorTableMode.Local;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegMetaDataTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegMetaDataTests.cs
index 431de4be31..054e79f514 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegMetaDataTests.cs
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public void CloneIsDeep()
{
var meta = new JpegMetaData() { Quality = 50 };
- var clone = (JpegMetaData)meta.DeepClone();
+ var clone = (JpegMetaData)meta.Clone();
clone.Quality = 99;
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngMetaDataTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngMetaDataTests.cs
index a21bb9acbe..4b209613ae 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngMetaDataTests.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
ColorType = PngColorType.GrayscaleWithAlpha,
Gamma = 2
};
- var clone = (PngMetaData)meta.DeepClone();
+ var clone = (PngMetaData)meta.Clone();
clone.BitDepth = PngBitDepth.Bit2;
clone.ColorType = PngColorType.Palette;
diff --git a/tests/ImageSharp.Tests/MetaData/ImageFrameMetaDataTests.cs b/tests/ImageSharp.Tests/MetaData/ImageFrameMetaDataTests.cs
index 8c49039603..428b7c431a 100644
--- a/tests/ImageSharp.Tests/MetaData/ImageFrameMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/ImageFrameMetaDataTests.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests
public void CloneIsDeep()
{
var metaData = new ImageFrameMetaData();
- ImageFrameMetaData clone = metaData.DeepClone();
+ ImageFrameMetaData clone = metaData.Clone();
Assert.False(metaData.GetFormatMetaData(GifFormat.Instance).Equals(clone.GetFormatMetaData(GifFormat.Instance)));
}
}
diff --git a/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs b/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
index b9619cb3f8..79fd7b7d2b 100644
--- a/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.Tests
metaData.VerticalResolution = 2;
metaData.Properties.Add(imageProperty);
- ImageMetaData clone = metaData.DeepClone();
+ ImageMetaData clone = metaData.Clone();
Assert.Equal(exifProfile.ToByteArray(), clone.ExifProfile.ToByteArray());
Assert.Equal(4, clone.HorizontalResolution);
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Tests
metaData.VerticalResolution = 2;
metaData.Properties.Add(imageProperty);
- ImageMetaData clone = metaData.DeepClone();
+ ImageMetaData clone = metaData.Clone();
clone.HorizontalResolution = 2;
clone.VerticalResolution = 4;
diff --git a/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs b/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
index c10ffb6c8e..ee41c1759f 100644
--- a/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
@@ -67,16 +67,16 @@ namespace SixLabors.ImageSharp.Tests
[Fact]
public void ConstructorCopy()
{
- Assert.Throws(() => ((ExifProfile)null).DeepClone());
+ Assert.Throws(() => ((ExifProfile)null).Clone());
ExifProfile profile = GetExifProfile();
- ExifProfile clone = profile.DeepClone();
+ ExifProfile clone = profile.Clone();
TestProfile(clone);
profile.SetValue(ExifTag.ColorSpace, (ushort)2);
- clone = profile.DeepClone();
+ clone = profile.Clone();
TestProfile(clone);
}