diff --git a/src/ImageSharp/Common/Helpers/UnitConverter.cs b/src/ImageSharp/Common/Helpers/UnitConverter.cs
index c8b25bf564..75dbb032c5 100644
--- a/src/ImageSharp/Common/Helpers/UnitConverter.cs
+++ b/src/ImageSharp/Common/Helpers/UnitConverter.cs
@@ -2,8 +2,8 @@
// Licensed under the Apache License, Version 2.0.
using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.MetaData;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
namespace SixLabors.ImageSharp.Common.Helpers
{
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index d33ada2864..b52c3754e2 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -9,7 +9,7 @@
using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.Common.Helpers;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Memory;
@@ -66,12 +66,12 @@ internal sealed class BmpDecoderCore
///
/// The metadata.
///
- private ImageMetaData metaData;
+ private ImageMetadata metadata;
///
/// The bmp specific metadata.
///
- private BmpMetaData bmpMetaData;
+ private BmpMetadata bmpMetadata;
///
/// The file header containing general information.
@@ -116,7 +116,7 @@ public Image Decode(Stream stream)
{
int bytesPerColorMapEntry = this.ReadImageHeaders(stream, out bool inverted, out byte[] palette);
- var image = new Image(this.configuration, this.infoHeader.Width, this.infoHeader.Height, this.metaData);
+ var image = new Image(this.configuration, this.infoHeader.Width, this.infoHeader.Height, this.metadata);
Buffer2D pixels = image.GetRootFramePixelBuffer();
@@ -125,7 +125,7 @@ public Image Decode(Stream stream)
case BmpCompression.RGB:
if (this.infoHeader.BitsPerPixel == 32)
{
- if (this.bmpMetaData.InfoHeaderType == BmpInfoHeaderType.WinVersion3)
+ if (this.bmpMetadata.InfoHeaderType == BmpInfoHeaderType.WinVersion3)
{
this.ReadRgb32Slow(pixels, this.infoHeader.Width, this.infoHeader.Height, inverted);
}
@@ -188,7 +188,7 @@ public Image Decode(Stream stream)
public IImageInfo Identify(Stream stream)
{
this.ReadImageHeaders(stream, out _, out _);
- return new ImageInfo(new PixelTypeInfo(this.infoHeader.BitsPerPixel), this.infoHeader.Width, this.infoHeader.Height, this.metaData);
+ return new ImageInfo(new PixelTypeInfo(this.infoHeader.BitsPerPixel), this.infoHeader.Width, this.infoHeader.Height, this.metadata);
}
///
@@ -999,7 +999,7 @@ private void ReadInfoHeader()
}
// Resolution is stored in PPM.
- var meta = new ImageMetaData
+ var meta = new ImageMetadata
{
ResolutionUnits = PixelResolutionUnit.PixelsPerMeter
};
@@ -1011,21 +1011,21 @@ private void ReadInfoHeader()
else
{
// Convert default metadata values to PPM.
- meta.HorizontalResolution = Math.Round(UnitConverter.InchToMeter(ImageMetaData.DefaultHorizontalResolution));
- meta.VerticalResolution = Math.Round(UnitConverter.InchToMeter(ImageMetaData.DefaultVerticalResolution));
+ meta.HorizontalResolution = Math.Round(UnitConverter.InchToMeter(ImageMetadata.DefaultHorizontalResolution));
+ meta.VerticalResolution = Math.Round(UnitConverter.InchToMeter(ImageMetadata.DefaultVerticalResolution));
}
- this.metaData = meta;
+ this.metadata = meta;
short bitsPerPixel = this.infoHeader.BitsPerPixel;
- this.bmpMetaData = this.metaData.GetFormatMetaData(BmpFormat.Instance);
- this.bmpMetaData.InfoHeaderType = infoHeaderType;
+ this.bmpMetadata = this.metadata.GetFormatMetadata(BmpFormat.Instance);
+ this.bmpMetadata.InfoHeaderType = infoHeaderType;
// We can only encode at these bit rates so far.
if (bitsPerPixel.Equals((short)BmpBitsPerPixel.Pixel24)
|| bitsPerPixel.Equals((short)BmpBitsPerPixel.Pixel32))
{
- this.bmpMetaData.BitsPerPixel = (BmpBitsPerPixel)bitsPerPixel;
+ this.bmpMetadata.BitsPerPixel = (BmpBitsPerPixel)bitsPerPixel;
}
// skip the remaining header because we can't read those parts
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
index 27a38bc0d1..ad526f6689 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
@@ -7,7 +7,7 @@
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Common.Helpers;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Memory;
@@ -73,9 +73,9 @@ public void Encode(Image image, Stream stream)
Guard.NotNull(stream, nameof(stream));
this.configuration = image.GetConfiguration();
- ImageMetaData metaData = image.MetaData;
- BmpMetaData bmpMetaData = metaData.GetFormatMetaData(BmpFormat.Instance);
- this.bitsPerPixel = this.bitsPerPixel ?? bmpMetaData.BitsPerPixel;
+ ImageMetadata metadata = image.Metadata;
+ BmpMetadata bmpMetadata = metadata.GetFormatMetadata(BmpFormat.Instance);
+ this.bitsPerPixel = this.bitsPerPixel ?? bmpMetadata.BitsPerPixel;
short bpp = (short)this.bitsPerPixel;
int bytesPerLine = 4 * (((image.Width * bpp) + 31) / 32);
@@ -85,27 +85,27 @@ public void Encode(Image image, Stream stream)
int hResolution = 0;
int vResolution = 0;
- if (metaData.ResolutionUnits != PixelResolutionUnit.AspectRatio)
+ if (metadata.ResolutionUnits != PixelResolutionUnit.AspectRatio)
{
- if (metaData.HorizontalResolution > 0 && metaData.VerticalResolution > 0)
+ if (metadata.HorizontalResolution > 0 && metadata.VerticalResolution > 0)
{
- switch (metaData.ResolutionUnits)
+ switch (metadata.ResolutionUnits)
{
case PixelResolutionUnit.PixelsPerInch:
- hResolution = (int)Math.Round(UnitConverter.InchToMeter(metaData.HorizontalResolution));
- vResolution = (int)Math.Round(UnitConverter.InchToMeter(metaData.VerticalResolution));
+ hResolution = (int)Math.Round(UnitConverter.InchToMeter(metadata.HorizontalResolution));
+ vResolution = (int)Math.Round(UnitConverter.InchToMeter(metadata.VerticalResolution));
break;
case PixelResolutionUnit.PixelsPerCentimeter:
- hResolution = (int)Math.Round(UnitConverter.CmToMeter(metaData.HorizontalResolution));
- vResolution = (int)Math.Round(UnitConverter.CmToMeter(metaData.VerticalResolution));
+ hResolution = (int)Math.Round(UnitConverter.CmToMeter(metadata.HorizontalResolution));
+ vResolution = (int)Math.Round(UnitConverter.CmToMeter(metadata.VerticalResolution));
break;
case PixelResolutionUnit.PixelsPerMeter:
- hResolution = (int)Math.Round(metaData.HorizontalResolution);
- vResolution = (int)Math.Round(metaData.VerticalResolution);
+ hResolution = (int)Math.Round(metadata.HorizontalResolution);
+ vResolution = (int)Math.Round(metadata.VerticalResolution);
break;
}
diff --git a/src/ImageSharp/Formats/Bmp/BmpFormat.cs b/src/ImageSharp/Formats/Bmp/BmpFormat.cs
index a5eaab8ebf..056fbe8406 100644
--- a/src/ImageSharp/Formats/Bmp/BmpFormat.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpFormat.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
///
/// Registers the image encoders, decoders and mime type detectors for the bmp format.
///
- public sealed class BmpFormat : IImageFormat
+ public sealed class BmpFormat : IImageFormat
{
private BmpFormat()
{
@@ -32,6 +32,6 @@ private BmpFormat()
public IEnumerable FileExtensions => BmpConstants.FileExtensions;
///
- public BmpMetaData CreateDefaultFormatMetaData() => new BmpMetaData();
+ public BmpMetadata CreateDefaultFormatMetadata() => new BmpMetadata();
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Bmp/BmpMetaData.cs b/src/ImageSharp/Formats/Bmp/BmpMetaData.cs
index 2d86856177..83d4eefe40 100644
--- a/src/ImageSharp/Formats/Bmp/BmpMetaData.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpMetaData.cs
@@ -6,20 +6,20 @@ namespace SixLabors.ImageSharp.Formats.Bmp
///
/// Provides Bmp specific metadata information for the image.
///
- public class BmpMetaData : IDeepCloneable
+ public class BmpMetadata : IDeepCloneable
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- public BmpMetaData()
+ public BmpMetadata()
{
}
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The metadata to create an instance from.
- private BmpMetaData(BmpMetaData other)
+ private BmpMetadata(BmpMetadata other)
{
this.BitsPerPixel = other.BitsPerPixel;
this.InfoHeaderType = other.InfoHeaderType;
@@ -36,7 +36,7 @@ private BmpMetaData(BmpMetaData other)
public BmpBitsPerPixel BitsPerPixel { get; set; } = BmpBitsPerPixel.Pixel24;
///
- public IDeepCloneable DeepClone() => new BmpMetaData(this);
+ public IDeepCloneable DeepClone() => new BmpMetadata(this);
// TODO: Colors used once we support encoding palette bmps.
}
diff --git a/src/ImageSharp/Formats/Gif/GifDecoder.cs b/src/ImageSharp/Formats/Gif/GifDecoder.cs
index 42c76d6400..6af75f2d0f 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoder.cs
@@ -3,7 +3,7 @@
using System.IO;
using System.Text;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp.Formats.Gif
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index bfa91416aa..e16ecb42e3 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -8,7 +8,7 @@
using System.Text;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Memory;
using SixLabors.Primitives;
@@ -63,12 +63,12 @@ internal sealed class GifDecoderCore
///
/// The abstract metadata.
///
- private ImageMetaData metaData;
+ private ImageMetadata metadata;
///
/// The gif specific metadata.
///
- private GifMetaData gifMetaData;
+ private GifMetadata gifMetadata;
///
/// Initializes a new instance of the class.
@@ -223,7 +223,7 @@ public IImageInfo Identify(Stream stream)
new PixelTypeInfo(this.logicalScreenDescriptor.BitsPerPixel),
this.logicalScreenDescriptor.Width,
this.logicalScreenDescriptor.Height,
- this.metaData);
+ this.metadata);
}
///
@@ -276,7 +276,7 @@ private void ReadApplicationExtension()
if (subBlockSize == GifConstants.NetscapeLoopingSubBlockSize)
{
this.stream.Read(this.buffer, 0, GifConstants.NetscapeLoopingSubBlockSize);
- this.gifMetaData.RepeatCount = GifNetscapeLoopingApplicationExtension.Parse(this.buffer.AsSpan(1)).RepeatCount;
+ this.gifMetadata.RepeatCount = GifNetscapeLoopingApplicationExtension.Parse(this.buffer.AsSpan(1)).RepeatCount;
this.stream.Skip(1); // Skip the terminator.
return;
}
@@ -334,7 +334,7 @@ private void ReadComments()
{
this.stream.Read(commentsBuffer.Array, 0, length);
string comments = this.TextEncoding.GetString(commentsBuffer.Array, 0, length);
- this.metaData.Properties.Add(new ImageProperty(GifConstants.Comments, comments));
+ this.metadata.Properties.Add(new ImageProperty(GifConstants.Comments, comments));
}
}
}
@@ -416,9 +416,9 @@ private void ReadFrameColors(ref Image image, ref ImageFrame(this.configuration, imageWidth, imageHeight, this.metaData);
+ image = new Image(this.configuration, imageWidth, imageHeight, this.metadata);
- this.SetFrameMetaData(image.Frames.RootFrame.MetaData);
+ this.SetFrameMetadata(image.Frames.RootFrame.Metadata);
imageFrame = image.Frames.RootFrame;
}
@@ -431,7 +431,7 @@ private void ReadFrameColors(ref Image image, ref ImageFrame(ImageFrame frame)
///
/// Sets the frames metadata.
///
- /// The meta data.
+ /// The metadata.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- private void SetFrameMetaData(ImageFrameMetaData meta)
+ private void SetFrameMetadata(ImageFrameMetadata meta)
{
- GifFrameMetaData gifMeta = meta.GetFormatMetaData(GifFormat.Instance);
+ GifFrameMetadata gifMeta = meta.GetFormatMetadata(GifFormat.Instance);
if (this.graphicsControlExtension.DelayTime > 0)
{
gifMeta.FrameDelay = this.graphicsControlExtension.DelayTime;
@@ -586,7 +586,7 @@ private void ReadLogicalScreenDescriptorAndGlobalColorTable(Stream stream)
this.stream.Skip(6);
this.ReadLogicalScreenDescriptor();
- var meta = new ImageMetaData();
+ var meta = new ImageMetadata();
// The Pixel Aspect Ratio is defined to be the quotient of the pixel's
// width over its height. The value range in this field allows
@@ -614,16 +614,16 @@ private void ReadLogicalScreenDescriptorAndGlobalColorTable(Stream stream)
}
}
- this.metaData = meta;
- this.gifMetaData = meta.GetFormatMetaData(GifFormat.Instance);
- this.gifMetaData.ColorTableMode = this.logicalScreenDescriptor.GlobalColorTableFlag
+ this.metadata = meta;
+ this.gifMetadata = meta.GetFormatMetadata(GifFormat.Instance);
+ this.gifMetadata.ColorTableMode = this.logicalScreenDescriptor.GlobalColorTableFlag
? GifColorTableMode.Global
: GifColorTableMode.Local;
if (this.logicalScreenDescriptor.GlobalColorTableFlag)
{
int globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
- this.gifMetaData.GlobalColorTableLength = globalColorTableLength;
+ this.gifMetadata.GlobalColorTableLength = globalColorTableLength;
this.globalColorTable = this.MemoryAllocator.AllocateManagedByteBuffer(globalColorTableLength, AllocationOptions.Clean);
diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
index c8580144ad..e5a5463ebb 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
@@ -10,7 +10,7 @@
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing.Processors.Quantization;
using SixLabors.Memory;
@@ -58,9 +58,9 @@ internal sealed class GifEncoderCore
private int bitDepth;
///
- /// Gif specific meta data.
+ /// Gif specific metadata.
///
- private GifMetaData gifMetaData;
+ private GifMetadata gifMetadata;
///
/// Initializes a new instance of the class.
@@ -89,9 +89,9 @@ public void Encode(Image image, Stream stream)
this.configuration = image.GetConfiguration();
- ImageMetaData metaData = image.MetaData;
- this.gifMetaData = metaData.GetFormatMetaData(GifFormat.Instance);
- this.colorTableMode = this.colorTableMode ?? this.gifMetaData.ColorTableMode;
+ ImageMetadata metadata = image.Metadata;
+ this.gifMetadata = metadata.GetFormatMetadata(GifFormat.Instance);
+ this.colorTableMode = this.colorTableMode ?? this.gifMetadata.ColorTableMode;
bool useGlobalTable = this.colorTableMode == GifColorTableMode.Global;
// Quantize the image returning a palette.
@@ -106,7 +106,7 @@ public void Encode(Image image, Stream stream)
// Write the LSD.
int index = this.GetTransparentIndex(quantized);
- this.WriteLogicalScreenDescriptor(metaData, image.Width, image.Height, index, useGlobalTable, stream);
+ this.WriteLogicalScreenDescriptor(metadata, image.Width, image.Height, index, useGlobalTable, stream);
if (useGlobalTable)
{
@@ -114,12 +114,12 @@ public void Encode(Image image, Stream stream)
}
// Write the comments.
- this.WriteComments(metaData, stream);
+ this.WriteComments(metadata, stream);
// Write application extension to allow additional frames.
if (image.Frames.Count > 1)
{
- this.WriteApplicationExtension(stream, this.gifMetaData.RepeatCount);
+ this.WriteApplicationExtension(stream, this.gifMetadata.RepeatCount);
}
if (useGlobalTable)
@@ -147,9 +147,9 @@ private void EncodeGlobal(Image image, QuantizedFrame qu
for (int i = 0; i < image.Frames.Count; i++)
{
ImageFrame frame = image.Frames[i];
- ImageFrameMetaData metaData = frame.MetaData;
- GifFrameMetaData frameMetaData = metaData.GetFormatMetaData(GifFormat.Instance);
- this.WriteGraphicalControlExtension(frameMetaData, transparencyIndex, stream);
+ ImageFrameMetadata metadata = frame.Metadata;
+ GifFrameMetadata frameMetadata = metadata.GetFormatMetadata(GifFormat.Instance);
+ this.WriteGraphicalControlExtension(frameMetadata, transparencyIndex, stream);
this.WriteImageDescriptor(frame, false, stream);
if (i == 0)
@@ -170,20 +170,20 @@ private void EncodeLocal(Image image, QuantizedFrame qua
where TPixel : struct, IPixel
{
ImageFrame previousFrame = null;
- GifFrameMetaData previousMeta = null;
+ GifFrameMetadata previousMeta = null;
foreach (ImageFrame frame in image.Frames)
{
- ImageFrameMetaData metaData = frame.MetaData;
- GifFrameMetaData frameMetaData = metaData.GetFormatMetaData(GifFormat.Instance);
+ ImageFrameMetadata metadata = frame.Metadata;
+ GifFrameMetadata frameMetadata = metadata.GetFormatMetadata(GifFormat.Instance);
if (quantized is null)
{
// Allow each frame to be encoded at whatever color depth the frame designates if set.
- if (previousFrame != null && previousMeta.ColorTableLength != frameMetaData.ColorTableLength
- && frameMetaData.ColorTableLength > 0)
+ if (previousFrame != null && previousMeta.ColorTableLength != frameMetadata.ColorTableLength
+ && frameMetadata.ColorTableLength > 0)
{
quantized = this.quantizer.CreateFrameQuantizer(
image.GetConfiguration(),
- frameMetaData.ColorTableLength).QuantizeFrame(frame);
+ frameMetadata.ColorTableLength).QuantizeFrame(frame);
}
else
{
@@ -193,7 +193,7 @@ private void EncodeLocal(Image image, QuantizedFrame qua
}
this.bitDepth = ImageMaths.GetBitsNeededForColorDepth(quantized.Palette.Length).Clamp(1, 8);
- this.WriteGraphicalControlExtension(frameMetaData, this.GetTransparentIndex(quantized), stream);
+ this.WriteGraphicalControlExtension(frameMetadata, this.GetTransparentIndex(quantized), stream);
this.WriteImageDescriptor(frame, true, stream);
this.WriteColorTable(quantized, stream);
this.WriteImageData(quantized, stream);
@@ -201,7 +201,7 @@ private void EncodeLocal(Image image, QuantizedFrame qua
quantized?.Dispose();
quantized = null; // So next frame can regenerate it
previousFrame = frame;
- previousMeta = frameMetaData;
+ previousMeta = frameMetadata;
}
}
@@ -250,14 +250,14 @@ private int GetTransparentIndex(QuantizedFrame quantized)
///
/// Writes the logical screen descriptor to the stream.
///
- /// The image metadata.
+ /// The image metadata.
/// The image width.
/// The image height.
/// The transparency index to set the default background index to.
/// Whether to use a global or local color table.
/// The stream to write to.
private void WriteLogicalScreenDescriptor(
- ImageMetaData metaData,
+ ImageMetadata metadata,
int width,
int height,
int transparencyIndex,
@@ -277,10 +277,10 @@ private void WriteLogicalScreenDescriptor(
// Aspect Ratio = (Pixel Aspect Ratio + 15) / 64
byte ratio = 0;
- if (metaData.ResolutionUnits == PixelResolutionUnit.AspectRatio)
+ if (metadata.ResolutionUnits == PixelResolutionUnit.AspectRatio)
{
- double hr = metaData.HorizontalResolution;
- double vr = metaData.VerticalResolution;
+ double hr = metadata.HorizontalResolution;
+ double vr = metadata.VerticalResolution;
if (hr != vr)
{
if (hr > vr)
@@ -326,7 +326,7 @@ private void WriteApplicationExtension(Stream stream, ushort repeatCount)
///
/// The metadata to be extract the comment data.
/// The stream to write to.
- private void WriteComments(ImageMetaData metadata, Stream stream)
+ private void WriteComments(ImageMetadata metadata, Stream stream)
{
if (!metadata.TryGetProperty(GifConstants.Comments, out ImageProperty property)
|| string.IsNullOrEmpty(property.Value))
@@ -350,18 +350,18 @@ private void WriteComments(ImageMetaData metadata, Stream stream)
///
/// Writes the graphics control extension to the stream.
///
- /// The metadata of the image or frame.
+ /// The metadata of the image or frame.
/// The index of the color in the color palette to make transparent.
/// The stream to write to.
- private void WriteGraphicalControlExtension(GifFrameMetaData metaData, int transparencyIndex, Stream stream)
+ private void WriteGraphicalControlExtension(GifFrameMetadata metadata, int transparencyIndex, Stream stream)
{
byte packedValue = GifGraphicControlExtension.GetPackedValue(
- disposalMethod: metaData.DisposalMethod,
+ disposalMethod: metadata.DisposalMethod,
transparencyFlag: transparencyIndex > -1);
var extension = new GifGraphicControlExtension(
packed: packedValue,
- delayTime: (ushort)metaData.FrameDelay,
+ delayTime: (ushort)metadata.FrameDelay,
transparencyIndex: unchecked((byte)transparencyIndex));
this.WriteExtension(extension, stream);
diff --git a/src/ImageSharp/Formats/Gif/GifFormat.cs b/src/ImageSharp/Formats/Gif/GifFormat.cs
index 07d4a54547..abe87819c6 100644
--- a/src/ImageSharp/Formats/Gif/GifFormat.cs
+++ b/src/ImageSharp/Formats/Gif/GifFormat.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
///
/// Registers the image encoders, decoders and mime type detectors for the gif format.
///
- public sealed class GifFormat : IImageFormat
+ public sealed class GifFormat : IImageFormat
{
private GifFormat()
{
@@ -32,9 +32,9 @@ private GifFormat()
public IEnumerable FileExtensions => GifConstants.FileExtensions;
///
- public GifMetaData CreateDefaultFormatMetaData() => new GifMetaData();
+ public GifMetadata CreateDefaultFormatMetadata() => new GifMetadata();
///
- public GifFrameMetaData CreateDefaultFormatFrameMetaData() => new GifFrameMetaData();
+ public GifFrameMetadata CreateDefaultFormatFrameMetadata() => new GifFrameMetadata();
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs b/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs
index 0042c6a108..613825ad63 100644
--- a/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs
+++ b/src/ImageSharp/Formats/Gif/GifFrameMetaData.cs
@@ -6,20 +6,20 @@ namespace SixLabors.ImageSharp.Formats.Gif
///
/// Provides Gif specific metadata information for the image frame.
///
- public class GifFrameMetaData : IDeepCloneable
+ public class GifFrameMetadata : IDeepCloneable
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- public GifFrameMetaData()
+ public GifFrameMetadata()
{
}
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The metadata to create an instance from.
- private GifFrameMetaData(GifFrameMetaData other)
+ private GifFrameMetadata(GifFrameMetadata other)
{
this.ColorTableLength = other.ColorTableLength;
this.FrameDelay = other.FrameDelay;
@@ -49,6 +49,6 @@ private GifFrameMetaData(GifFrameMetaData other)
public GifDisposalMethod DisposalMethod { get; set; }
///
- public IDeepCloneable DeepClone() => new GifFrameMetaData(this);
+ public IDeepCloneable DeepClone() => 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..0b6566fbfe 100644
--- a/src/ImageSharp/Formats/Gif/GifMetaData.cs
+++ b/src/ImageSharp/Formats/Gif/GifMetaData.cs
@@ -6,20 +6,20 @@ namespace SixLabors.ImageSharp.Formats.Gif
///
/// Provides Gif specific metadata information for the image.
///
- public class GifMetaData : IDeepCloneable
+ public class GifMetadata : IDeepCloneable
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- public GifMetaData()
+ public GifMetadata()
{
}
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The metadata to create an instance from.
- private GifMetaData(GifMetaData other)
+ private GifMetadata(GifMetadata other)
{
this.RepeatCount = other.RepeatCount;
this.ColorTableMode = other.ColorTableMode;
@@ -45,6 +45,6 @@ private GifMetaData(GifMetaData other)
public int GlobalColorTableLength { get; set; }
///
- public IDeepCloneable DeepClone() => new GifMetaData(this);
+ public IDeepCloneable DeepClone() => new GifMetadata(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs b/src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs
index 0c59163cce..871b511a0d 100644
--- a/src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs
+++ b/src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0.
using System.Text;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
namespace SixLabors.ImageSharp.Formats.Gif
{
diff --git a/src/ImageSharp/Formats/IImageFormat.cs b/src/ImageSharp/Formats/IImageFormat.cs
index 3cd289df76..bd0d6357cb 100644
--- a/src/ImageSharp/Formats/IImageFormat.cs
+++ b/src/ImageSharp/Formats/IImageFormat.cs
@@ -34,30 +34,30 @@ public interface IImageFormat
///
/// Defines the contract for an image format containing metadata.
///
- /// The type of format metadata.
- public interface IImageFormat : IImageFormat
- where TFormatMetaData : class
+ /// The type of format metadata.
+ public interface IImageFormat : IImageFormat
+ where TFormatMetadata : class
{
///
/// Creates a default instance of the format metadata.
///
- /// The .
- TFormatMetaData CreateDefaultFormatMetaData();
+ /// The .
+ TFormatMetadata CreateDefaultFormatMetadata();
}
///
/// Defines the contract for an image format containing metadata with multiple frames.
///
- /// The type of format metadata.
- /// The type of format frame metadata.
- public interface IImageFormat : IImageFormat
- where TFormatMetaData : class
- where TFormatFrameMetaData : class
+ /// The type of format metadata.
+ /// The type of format frame metadata.
+ public interface IImageFormat : IImageFormat
+ where TFormatMetadata : class
+ where TFormatFrameMetadata : class
{
///
/// Creates a default instance of the format frame metadata.
///
- /// The .
- TFormatFrameMetaData CreateDefaultFormatFrameMetaData();
+ /// The .
+ TFormatFrameMetadata CreateDefaultFormatFrameMetadata();
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
index 5bd5920dbe..7497c8a409 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0.
using System;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
{
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
index 891dd52826..9852b36e49 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -12,9 +12,9 @@
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
using SixLabors.ImageSharp.IO;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
-using SixLabors.ImageSharp.MetaData.Profiles.Icc;
+using SixLabors.ImageSharp.Metadata;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Primitives;
using SixLabors.Memory;
@@ -149,9 +149,9 @@ public JpegDecoderCore(Configuration configuration, IJpegDecoderOptions options)
public bool IgnoreMetadata { get; }
///
- /// Gets the decoded by this decoder instance.
+ /// Gets the decoded by this decoder instance.
///
- public ImageMetaData MetaData { get; private set; }
+ public ImageMetadata Metadata { get; private set; }
///
public int ComponentCount { get; private set; }
@@ -222,7 +222,7 @@ public Image Decode(Stream stream)
this.ParseStream(stream);
this.InitExifProfile();
this.InitIccProfile();
- this.InitDerivedMetaDataProperties();
+ this.InitDerivedMetadataProperties();
return this.PostProcessIntoImage();
}
@@ -235,9 +235,9 @@ public IImageInfo Identify(Stream stream)
this.ParseStream(stream, true);
this.InitExifProfile();
this.InitIccProfile();
- this.InitDerivedMetaDataProperties();
+ this.InitDerivedMetadataProperties();
- return new ImageInfo(new PixelTypeInfo(this.BitsPerPixel), this.ImageWidth, this.ImageHeight, this.MetaData);
+ return new ImageInfo(new PixelTypeInfo(this.BitsPerPixel), this.ImageWidth, this.ImageHeight, this.Metadata);
}
///
@@ -247,7 +247,7 @@ public IImageInfo Identify(Stream stream)
/// Whether to decode metadata only.
public void ParseStream(Stream stream, bool metadataOnly = false)
{
- this.MetaData = new ImageMetaData();
+ this.Metadata = new ImageMetadata();
this.InputStream = new DoubleBufferedStreamReader(this.configuration.MemoryAllocator, stream);
// Check for the Start Of Image marker.
@@ -430,7 +430,7 @@ private void InitExifProfile()
{
if (this.isExif)
{
- this.MetaData.ExifProfile = new ExifProfile(this.exifData);
+ this.Metadata.ExifProfile = new ExifProfile(this.exifData);
}
}
@@ -444,21 +444,21 @@ private void InitIccProfile()
var profile = new IccProfile(this.iccData);
if (profile.CheckIsValid())
{
- this.MetaData.IccProfile = profile;
+ this.Metadata.IccProfile = profile;
}
}
}
///
- /// Assigns derived metadata properties to , eg. horizontal and vertical resolution if it has a JFIF header.
+ /// Assigns derived metadata properties to , eg. horizontal and vertical resolution if it has a JFIF header.
///
- private void InitDerivedMetaDataProperties()
+ private void InitDerivedMetadataProperties()
{
if (this.jFif.XDensity > 0 && this.jFif.YDensity > 0)
{
- this.MetaData.HorizontalResolution = this.jFif.XDensity;
- this.MetaData.VerticalResolution = this.jFif.YDensity;
- this.MetaData.ResolutionUnits = this.jFif.DensityUnits;
+ this.Metadata.HorizontalResolution = this.jFif.XDensity;
+ this.Metadata.VerticalResolution = this.jFif.YDensity;
+ this.Metadata.ResolutionUnits = this.jFif.DensityUnits;
}
else if (this.isExif)
{
@@ -467,16 +467,16 @@ private void InitDerivedMetaDataProperties()
if (horizontalValue > 0 && verticalValue > 0)
{
- this.MetaData.HorizontalResolution = horizontalValue;
- this.MetaData.VerticalResolution = verticalValue;
- this.MetaData.ResolutionUnits = UnitConverter.ExifProfileToResolutionUnit(this.MetaData.ExifProfile);
+ this.Metadata.HorizontalResolution = horizontalValue;
+ this.Metadata.VerticalResolution = verticalValue;
+ this.Metadata.ResolutionUnits = UnitConverter.ExifProfileToResolutionUnit(this.Metadata.ExifProfile);
}
}
}
private double GetExifResolutionValue(ExifTag tag)
{
- if (!this.MetaData.ExifProfile.TryGetValue(tag, out ExifValue exifValue))
+ if (!this.Metadata.ExifProfile.TryGetValue(tag, out ExifValue exifValue))
{
return 0;
}
@@ -713,7 +713,7 @@ private void ProcessDefineQuantizationTablesMarker(int remaining)
JpegThrowHelper.ThrowBadMarker(nameof(JpegConstants.Markers.DQT), remaining);
}
- this.MetaData.GetFormatMetaData(JpegFormat.Instance).Quality = QualityEvaluator.EstimateQuality(this.QuantizationTables);
+ this.Metadata.GetFormatMetadata(JpegFormat.Instance).Quality = QualityEvaluator.EstimateQuality(this.QuantizationTables);
}
///
@@ -992,7 +992,7 @@ private Image PostProcessIntoImage()
this.configuration,
this.ImageWidth,
this.ImageHeight,
- this.MetaData);
+ this.Metadata);
using (var postProcessor = new JpegImagePostProcessor(this.configuration, this))
{
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
index 4544244f08..d4ce28107f 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
@@ -10,9 +10,9 @@
using SixLabors.ImageSharp.Formats.Jpeg.Components;
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
using SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder;
-using SixLabors.ImageSharp.MetaData;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
-using SixLabors.ImageSharp.MetaData.Profiles.Icc;
+using SixLabors.ImageSharp.Metadata;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp.Formats.Jpeg
@@ -204,10 +204,10 @@ public void Encode(Image image, Stream stream)
}
this.outputStream = stream;
- ImageMetaData metaData = image.MetaData;
+ ImageMetadata metadata = image.Metadata;
// System.Drawing produces identical output for jpegs with a quality parameter of 0 and 1.
- int qlty = (this.quality ?? metaData.GetFormatMetaData(JpegFormat.Instance).Quality).Clamp(1, 100);
+ int qlty = (this.quality ?? metadata.GetFormatMetadata(JpegFormat.Instance).Quality).Clamp(1, 100);
this.subsample = this.subsample ?? (qlty >= 91 ? JpegSubsample.Ratio444 : JpegSubsample.Ratio420);
// Convert from a quality rating to a scaling factor.
@@ -229,10 +229,10 @@ public void Encode(Image image, Stream stream)
int componentCount = 3;
// Write the Start Of Image marker.
- this.WriteApplicationHeader(metaData);
+ this.WriteApplicationHeader(metadata);
// Write Exif and ICC profiles
- this.WriteProfiles(metaData);
+ this.WriteProfiles(metadata);
// Write the quantization tables.
this.WriteDefineQuantizationTables();
@@ -448,8 +448,8 @@ private void Encode444(Image pixels)
///
/// Writes the application header containing the JFIF identifier plus extra data.
///
- /// The image meta data.
- private void WriteApplicationHeader(ImageMetaData meta)
+ /// The image metadata.
+ private void WriteApplicationHeader(ImageMetadata meta)
{
// Write the start of image marker. Markers are always prefixed with 0xff.
this.buffer[0] = JpegConstants.Markers.XFF;
@@ -791,17 +791,17 @@ private void WriteIccProfile(IccProfile iccProfile)
///
/// Writes the metadata profiles to the image.
///
- /// The image meta data.
- private void WriteProfiles(ImageMetaData metaData)
+ /// The image metadata.
+ private void WriteProfiles(ImageMetadata metadata)
{
- if (metaData is null)
+ if (metadata is null)
{
return;
}
- metaData.SyncProfiles();
- this.WriteExifProfile(metaData.ExifProfile);
- this.WriteIccProfile(metaData.IccProfile);
+ metadata.SyncProfiles();
+ this.WriteExifProfile(metadata.ExifProfile);
+ this.WriteIccProfile(metadata.IccProfile);
}
///
diff --git a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs
index 6b23ceac7a..f56072a4b5 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
///
/// Registers the image encoders, decoders and mime type detectors for the jpeg format.
///
- public sealed class JpegFormat : IImageFormat
+ public sealed class JpegFormat : IImageFormat
{
private JpegFormat()
{
@@ -32,6 +32,6 @@ private JpegFormat()
public IEnumerable FileExtensions => JpegConstants.FileExtensions;
///
- public JpegMetaData CreateDefaultFormatMetaData() => new JpegMetaData();
+ public JpegMetadata CreateDefaultFormatMetadata() => new JpegMetadata();
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs b/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs
index fcad29e5d0..9f0deae02c 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegMetaData.cs
@@ -6,20 +6,20 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
///
/// Provides Jpeg specific metadata information for the image.
///
- public class JpegMetaData : IDeepCloneable
+ public class JpegMetadata : IDeepCloneable
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- public JpegMetaData()
+ public JpegMetadata()
{
}
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The metadata to create an instance from.
- private JpegMetaData(JpegMetaData other) => this.Quality = other.Quality;
+ private JpegMetadata(JpegMetadata other) => this.Quality = other.Quality;
///
/// Gets or sets the encoded quality.
@@ -27,6 +27,6 @@ public JpegMetaData()
public int Quality { get; set; } = 75;
///
- public IDeepCloneable DeepClone() => new JpegMetaData(this);
+ public IDeepCloneable DeepClone() => new JpegMetadata(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/Chunks/PhysicalChunkData.cs b/src/ImageSharp/Formats/Png/Chunks/PhysicalChunkData.cs
index 1d0e280bd3..8b3c3e9aad 100644
--- a/src/ImageSharp/Formats/Png/Chunks/PhysicalChunkData.cs
+++ b/src/ImageSharp/Formats/Png/Chunks/PhysicalChunkData.cs
@@ -4,7 +4,7 @@
using System;
using System.Buffers.Binary;
using SixLabors.ImageSharp.Common.Helpers;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
namespace SixLabors.ImageSharp.Formats.Png.Chunks
{
@@ -60,7 +60,7 @@ public static PhysicalChunkData Parse(ReadOnlySpan data)
///
/// The metadata.
/// The constructed PngPhysicalChunkData instance.
- public static PhysicalChunkData FromMetadata(ImageMetaData meta)
+ public static PhysicalChunkData FromMetadata(ImageMetadata meta)
{
byte unitSpecifier = 0;
uint x;
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 9ffac5e626..5e9d1440ac 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -12,8 +12,8 @@
using SixLabors.ImageSharp.Formats.Png.Filters;
using SixLabors.ImageSharp.Formats.Png.Zlib;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Memory;
@@ -157,8 +157,8 @@ public PngDecoderCore(Configuration configuration, IPngDecoderOptions options)
public Image Decode(Stream stream)
where TPixel : struct, IPixel
{
- var metaData = new ImageMetaData();
- PngMetaData pngMetaData = metaData.GetFormatMetaData(PngFormat.Instance);
+ var metadata = new ImageMetadata();
+ PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance);
this.currentStream = stream;
this.currentStream.Skip(8);
Image image = null;
@@ -171,24 +171,24 @@ public Image Decode(Stream stream)
switch (chunk.Type)
{
case PngChunkType.Header:
- this.ReadHeaderChunk(pngMetaData, chunk.Data.Array);
+ this.ReadHeaderChunk(pngMetadata, chunk.Data.Array);
break;
case PngChunkType.Physical:
- this.ReadPhysicalChunk(metaData, chunk.Data.GetSpan());
+ this.ReadPhysicalChunk(metadata, chunk.Data.GetSpan());
break;
case PngChunkType.Gamma:
- this.ReadGammaChunk(pngMetaData, chunk.Data.GetSpan());
+ this.ReadGammaChunk(pngMetadata, chunk.Data.GetSpan());
break;
case PngChunkType.Data:
if (image is null)
{
- this.InitializeImage(metaData, out image);
+ this.InitializeImage(metadata, out image);
}
using (var deframeStream = new ZlibInflateStream(this.currentStream, this.ReadNextDataChunk))
{
deframeStream.AllocateNewBytes(chunk.Length);
- this.ReadScanlines(deframeStream.CompressedStream, image.Frames.RootFrame, pngMetaData);
+ this.ReadScanlines(deframeStream.CompressedStream, image.Frames.RootFrame, pngMetadata);
}
break;
@@ -201,17 +201,17 @@ public Image Decode(Stream stream)
byte[] alpha = new byte[chunk.Length];
Buffer.BlockCopy(chunk.Data.Array, 0, alpha, 0, chunk.Length);
this.paletteAlpha = alpha;
- this.AssignTransparentMarkers(alpha, pngMetaData);
+ this.AssignTransparentMarkers(alpha, pngMetadata);
break;
case PngChunkType.Text:
- this.ReadTextChunk(metaData, chunk.Data.Array.AsSpan(0, chunk.Length));
+ this.ReadTextChunk(metadata, chunk.Data.Array.AsSpan(0, chunk.Length));
break;
case PngChunkType.Exif:
if (!this.ignoreMetadata)
{
byte[] exifData = new byte[chunk.Length];
Buffer.BlockCopy(chunk.Data.Array, 0, exifData, 0, chunk.Length);
- metaData.ExifProfile = new ExifProfile(exifData);
+ metadata.ExifProfile = new ExifProfile(exifData);
}
break;
@@ -246,8 +246,8 @@ public Image Decode(Stream stream)
/// The containing image data.
public IImageInfo Identify(Stream stream)
{
- var metaData = new ImageMetaData();
- PngMetaData pngMetaData = metaData.GetFormatMetaData(PngFormat.Instance);
+ var metadata = new ImageMetadata();
+ PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance);
this.currentStream = stream;
this.currentStream.Skip(8);
try
@@ -259,19 +259,19 @@ public IImageInfo Identify(Stream stream)
switch (chunk.Type)
{
case PngChunkType.Header:
- this.ReadHeaderChunk(pngMetaData, chunk.Data.Array);
+ this.ReadHeaderChunk(pngMetadata, chunk.Data.Array);
break;
case PngChunkType.Physical:
- this.ReadPhysicalChunk(metaData, chunk.Data.GetSpan());
+ this.ReadPhysicalChunk(metadata, chunk.Data.GetSpan());
break;
case PngChunkType.Gamma:
- this.ReadGammaChunk(pngMetaData, chunk.Data.GetSpan());
+ this.ReadGammaChunk(pngMetadata, chunk.Data.GetSpan());
break;
case PngChunkType.Data:
this.SkipChunkDataAndCrc(chunk);
break;
case PngChunkType.Text:
- this.ReadTextChunk(metaData, chunk.Data.Array.AsSpan(0, chunk.Length));
+ this.ReadTextChunk(metadata, chunk.Data.Array.AsSpan(0, chunk.Length));
break;
case PngChunkType.End:
this.isEndChunkReached = true;
@@ -295,7 +295,7 @@ public IImageInfo Identify(Stream stream)
throw new ImageFormatException("PNG Image does not contain a header chunk");
}
- return new ImageInfo(new PixelTypeInfo(this.CalculateBitsPerPixel()), this.header.Width, this.header.Height, metaData);
+ return new ImageInfo(new PixelTypeInfo(this.CalculateBitsPerPixel()), this.header.Width, this.header.Height, metadata);
}
///
@@ -350,7 +350,7 @@ private bool TryScaleUpTo8BitArray(ReadOnlySpan source, int bytesPerScanli
///
/// The metadata to read to.
/// The data containing physical data.
- private void ReadPhysicalChunk(ImageMetaData metadata, ReadOnlySpan data)
+ private void ReadPhysicalChunk(ImageMetadata metadata, ReadOnlySpan data)
{
var physicalChunk = PhysicalChunkData.Parse(data);
@@ -367,7 +367,7 @@ private void ReadPhysicalChunk(ImageMetaData metadata, ReadOnlySpan data)
///
/// The metadata to read to.
/// The data containing physical data.
- private void ReadGammaChunk(PngMetaData pngMetadata, ReadOnlySpan data)
+ private void ReadGammaChunk(PngMetadata pngMetadata, ReadOnlySpan data)
{
// The value is encoded as a 4-byte unsigned integer, representing gamma times 100000.
// For example, a gamma of 1/2.2 would be stored as 45455.
@@ -380,7 +380,7 @@ private void ReadGammaChunk(PngMetaData pngMetadata, ReadOnlySpan data)
/// The type the pixels will be
/// The metadata information for the image
/// The image that we will populate
- private void InitializeImage(ImageMetaData metadata, out Image image)
+ private void InitializeImage(ImageMetadata metadata, out Image image)
where TPixel : struct, IPixel
{
image = new Image(this.configuration, this.header.Width, this.header.Height, metadata);
@@ -471,17 +471,17 @@ private int CalculateScanlineLength(int width)
/// The pixel format.
/// The containing data.
/// The pixel data.
- /// The png meta data
- private void ReadScanlines(Stream dataStream, ImageFrame image, PngMetaData pngMetaData)
+ /// The png metadata
+ private void ReadScanlines(Stream dataStream, ImageFrame image, PngMetadata pngMetadata)
where TPixel : struct, IPixel
{
if (this.header.InterlaceMethod == PngInterlaceMode.Adam7)
{
- this.DecodeInterlacedPixelData(dataStream, image, pngMetaData);
+ this.DecodeInterlacedPixelData(dataStream, image, pngMetadata);
}
else
{
- this.DecodePixelData(dataStream, image, pngMetaData);
+ this.DecodePixelData(dataStream, image, pngMetadata);
}
}
@@ -491,8 +491,8 @@ private void ReadScanlines(Stream dataStream, ImageFrame image,
/// The pixel format.
/// The compressed pixel data stream.
/// The image to decode to.
- /// The png meta data
- private void DecodePixelData(Stream compressedStream, ImageFrame image, PngMetaData pngMetaData)
+ /// The png metadata
+ private void DecodePixelData(Stream compressedStream, ImageFrame image, PngMetadata pngMetadata)
where TPixel : struct, IPixel
{
while (this.currentRow < this.header.Height)
@@ -532,7 +532,7 @@ private void DecodePixelData(Stream compressedStream, ImageFrame
throw new ImageFormatException("Unknown filter type.");
}
- this.ProcessDefilteredScanline(scanlineSpan, image, pngMetaData);
+ this.ProcessDefilteredScanline(scanlineSpan, image, pngMetadata);
this.SwapBuffers();
this.currentRow++;
@@ -546,8 +546,8 @@ private void DecodePixelData(Stream compressedStream, ImageFrame
/// The pixel format.
/// The compressed pixel data stream.
/// The current image.
- /// The png meta data
- private void DecodeInterlacedPixelData(Stream compressedStream, ImageFrame image, PngMetaData pngMetaData)
+ /// The png metadata.
+ private void DecodeInterlacedPixelData(Stream compressedStream, ImageFrame image, PngMetadata pngMetadata)
where TPixel : struct, IPixel
{
while (true)
@@ -604,7 +604,7 @@ private void DecodeInterlacedPixelData(Stream compressedStream, ImageFra
}
Span rowSpan = image.GetPixelRowSpan(this.currentRow);
- this.ProcessInterlacedDefilteredScanline(this.scanline.GetSpan(), rowSpan, pngMetaData, Adam7.FirstColumn[this.pass], Adam7.ColumnIncrement[this.pass]);
+ this.ProcessInterlacedDefilteredScanline(this.scanline.GetSpan(), rowSpan, pngMetadata, Adam7.FirstColumn[this.pass], Adam7.ColumnIncrement[this.pass]);
this.SwapBuffers();
@@ -632,8 +632,8 @@ private void DecodeInterlacedPixelData(Stream compressedStream, ImageFra
/// The pixel format.
/// The de-filtered scanline
/// The image
- /// The png meta data
- private void ProcessDefilteredScanline(ReadOnlySpan defilteredScanline, ImageFrame pixels, PngMetaData pngMetaData)
+ /// The png metadata.
+ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScanline, ImageFrame pixels, PngMetadata pngMetadata)
where TPixel : struct, IPixel
{
Span rowSpan = pixels.GetPixelRowSpan(this.currentRow);
@@ -653,9 +653,9 @@ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScan
this.header,
scanlineSpan,
rowSpan,
- pngMetaData.HasTrans,
- pngMetaData.TransparentGray16.GetValueOrDefault(),
- pngMetaData.TransparentGray8.GetValueOrDefault());
+ pngMetadata.HasTrans,
+ pngMetadata.TransparentGray16.GetValueOrDefault(),
+ pngMetadata.TransparentGray8.GetValueOrDefault());
break;
@@ -687,9 +687,9 @@ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScan
rowSpan,
this.bytesPerPixel,
this.bytesPerSample,
- pngMetaData.HasTrans,
- pngMetaData.TransparentRgb48.GetValueOrDefault(),
- pngMetaData.TransparentRgb24.GetValueOrDefault());
+ pngMetadata.HasTrans,
+ pngMetadata.TransparentRgb48.GetValueOrDefault(),
+ pngMetadata.TransparentRgb24.GetValueOrDefault());
break;
@@ -714,10 +714,10 @@ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScan
/// The pixel format.
/// The de-filtered scanline
/// The current image row.
- /// The png meta data
+ /// The png metadata.
/// The column start index. Always 0 for none interlaced images.
/// The column increment. Always 1 for none interlaced images.
- private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defilteredScanline, Span rowSpan, PngMetaData pngMetaData, int pixelOffset = 0, int increment = 1)
+ private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defilteredScanline, Span rowSpan, PngMetadata pngMetadata, int pixelOffset = 0, int increment = 1)
where TPixel : struct, IPixel
{
// Trim the first marker byte from the buffer
@@ -737,9 +737,9 @@ private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defi
rowSpan,
pixelOffset,
increment,
- pngMetaData.HasTrans,
- pngMetaData.TransparentGray16.GetValueOrDefault(),
- pngMetaData.TransparentGray8.GetValueOrDefault());
+ pngMetadata.HasTrans,
+ pngMetadata.TransparentGray16.GetValueOrDefault(),
+ pngMetadata.TransparentGray8.GetValueOrDefault());
break;
@@ -776,9 +776,9 @@ private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defi
increment,
this.bytesPerPixel,
this.bytesPerSample,
- pngMetaData.HasTrans,
- pngMetaData.TransparentRgb48.GetValueOrDefault(),
- pngMetaData.TransparentRgb24.GetValueOrDefault());
+ pngMetadata.HasTrans,
+ pngMetadata.TransparentRgb48.GetValueOrDefault(),
+ pngMetadata.TransparentRgb24.GetValueOrDefault());
break;
@@ -799,11 +799,11 @@ private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defi
}
///
- /// Decodes and assigns marker colors that identify transparent pixels in non indexed images
+ /// Decodes and assigns marker colors that identify transparent pixels in non indexed images.
///
- /// The alpha tRNS array
- /// The png meta data
- private void AssignTransparentMarkers(ReadOnlySpan alpha, PngMetaData pngMetaData)
+ /// The alpha tRNS array.
+ /// The png metadata.
+ private void AssignTransparentMarkers(ReadOnlySpan alpha, PngMetadata pngMetadata)
{
if (this.pngColorType == PngColorType.Rgb)
{
@@ -815,16 +815,16 @@ private void AssignTransparentMarkers(ReadOnlySpan alpha, PngMetaData pngM
ushort gc = BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(2, 2));
ushort bc = BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(4, 2));
- pngMetaData.TransparentRgb48 = new Rgb48(rc, gc, bc);
- pngMetaData.HasTrans = true;
+ pngMetadata.TransparentRgb48 = new Rgb48(rc, gc, bc);
+ pngMetadata.HasTrans = true;
return;
}
byte r = ReadByteLittleEndian(alpha, 0);
byte g = ReadByteLittleEndian(alpha, 2);
byte b = ReadByteLittleEndian(alpha, 4);
- pngMetaData.TransparentRgb24 = new Rgb24(r, g, b);
- pngMetaData.HasTrans = true;
+ pngMetadata.TransparentRgb24 = new Rgb24(r, g, b);
+ pngMetadata.HasTrans = true;
}
}
else if (this.pngColorType == PngColorType.Grayscale)
@@ -833,14 +833,14 @@ private void AssignTransparentMarkers(ReadOnlySpan alpha, PngMetaData pngM
{
if (this.header.BitDepth == 16)
{
- pngMetaData.TransparentGray16 = new Gray16(BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(0, 2)));
+ pngMetadata.TransparentGray16 = new Gray16(BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(0, 2)));
}
else
{
- pngMetaData.TransparentGray8 = new Gray8(ReadByteLittleEndian(alpha, 0));
+ pngMetadata.TransparentGray8 = new Gray8(ReadByteLittleEndian(alpha, 0));
}
- pngMetaData.HasTrans = true;
+ pngMetadata.HasTrans = true;
}
}
}
@@ -848,16 +848,16 @@ private void AssignTransparentMarkers(ReadOnlySpan alpha, PngMetaData pngM
///
/// Reads a header chunk from the data.
///
- /// The png metadata.
+ /// The png metadata.
/// The containing data.
- private void ReadHeaderChunk(PngMetaData pngMetaData, ReadOnlySpan data)
+ private void ReadHeaderChunk(PngMetadata pngMetadata, ReadOnlySpan data)
{
this.header = PngHeader.Parse(data);
this.header.Validate();
- pngMetaData.BitDepth = (PngBitDepth)this.header.BitDepth;
- pngMetaData.ColorType = this.header.ColorType;
+ pngMetadata.BitDepth = (PngBitDepth)this.header.BitDepth;
+ pngMetadata.ColorType = this.header.ColorType;
this.pngColorType = this.header.ColorType;
}
@@ -867,7 +867,7 @@ private void ReadHeaderChunk(PngMetaData pngMetaData, ReadOnlySpan data)
///
/// The metadata to decode to.
/// The containing the data.
- private void ReadTextChunk(ImageMetaData metadata, ReadOnlySpan data)
+ private void ReadTextChunk(ImageMetadata metadata, ReadOnlySpan data)
{
if (this.ignoreMetadata)
{
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 96e2dd946d..9818e6cf17 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -14,7 +14,7 @@
using SixLabors.ImageSharp.Formats.Png.Filters;
using SixLabors.ImageSharp.Formats.Png.Zlib;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing.Processors.Quantization;
using SixLabors.Memory;
@@ -211,12 +211,12 @@ public void Encode(Image image, Stream stream)
this.height = image.Height;
// Always take the encoder options over the metadata values.
- ImageMetaData metaData = image.MetaData;
- PngMetaData pngMetaData = metaData.GetFormatMetaData(PngFormat.Instance);
- this.gamma = this.gamma ?? pngMetaData.Gamma;
+ ImageMetadata metadata = image.Metadata;
+ PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance);
+ this.gamma = this.gamma ?? pngMetadata.Gamma;
this.writeGamma = this.gamma > 0;
- this.pngColorType = this.pngColorType ?? pngMetaData.ColorType;
- this.pngBitDepth = this.pngBitDepth ?? pngMetaData.BitDepth;
+ this.pngColorType = this.pngColorType ?? pngMetadata.ColorType;
+ this.pngBitDepth = this.pngBitDepth ?? pngMetadata.BitDepth;
this.use16Bit = this.pngBitDepth == PngBitDepth.Bit16;
// Ensure we are not allowing impossible combinations.
@@ -290,14 +290,14 @@ public void Encode(Image image, Stream stream)
this.WritePaletteChunk(stream, quantized);
}
- if (pngMetaData.HasTrans)
+ if (pngMetadata.HasTrans)
{
- this.WriteTransparencyChunk(stream, pngMetaData);
+ this.WriteTransparencyChunk(stream, pngMetadata);
}
- this.WritePhysicalChunk(stream, metaData);
+ this.WritePhysicalChunk(stream, metadata);
this.WriteGammaChunk(stream);
- this.WriteExifChunk(stream, metaData);
+ this.WriteExifChunk(stream, metadata);
this.WriteDataChunks(image.Frames.RootFrame, quantized, stream);
this.WriteEndChunk(stream);
stream.Flush();
@@ -714,8 +714,8 @@ private void WritePaletteChunk(Stream stream, QuantizedFrame qua
/// Writes the physical dimension information to the stream.
///
/// The containing image data.
- /// The image meta data.
- private void WritePhysicalChunk(Stream stream, ImageMetaData meta)
+ /// The image metadata.
+ private void WritePhysicalChunk(Stream stream, ImageMetadata meta)
{
PhysicalChunkData.FromMetadata(meta).WriteTo(this.chunkDataBuffer);
@@ -723,11 +723,11 @@ private void WritePhysicalChunk(Stream stream, ImageMetaData meta)
}
///
- /// Writes the eXIf chunk to the stream, if any EXIF Profile values are present in the meta data.
+ /// Writes the eXIf chunk to the stream, if any EXIF Profile values are present in the metadata.
///
/// The containing image data.
- /// The image meta data.
- private void WriteExifChunk(Stream stream, ImageMetaData meta)
+ /// The image metadata.
+ private void WriteExifChunk(Stream stream, ImageMetadata meta)
{
if (meta.ExifProfile?.Values.Count > 0)
{
@@ -757,42 +757,42 @@ private void WriteGammaChunk(Stream stream)
/// Writes the transparency chunk to the stream
///
/// The containing image data.
- /// The image meta data.
- private void WriteTransparencyChunk(Stream stream, PngMetaData pngMetaData)
+ /// The image metadata.
+ private void WriteTransparencyChunk(Stream stream, PngMetadata pngMetadata)
{
Span alpha = this.chunkDataBuffer.AsSpan();
- if (pngMetaData.ColorType == PngColorType.Rgb)
+ if (pngMetadata.ColorType == PngColorType.Rgb)
{
- if (pngMetaData.TransparentRgb48.HasValue && this.use16Bit)
+ if (pngMetadata.TransparentRgb48.HasValue && this.use16Bit)
{
- Rgb48 rgb = pngMetaData.TransparentRgb48.Value;
+ Rgb48 rgb = pngMetadata.TransparentRgb48.Value;
BinaryPrimitives.WriteUInt16LittleEndian(alpha, rgb.R);
BinaryPrimitives.WriteUInt16LittleEndian(alpha.Slice(2, 2), rgb.G);
BinaryPrimitives.WriteUInt16LittleEndian(alpha.Slice(4, 2), rgb.B);
this.WriteChunk(stream, PngChunkType.Transparency, this.chunkDataBuffer, 0, 6);
}
- else if (pngMetaData.TransparentRgb24.HasValue)
+ else if (pngMetadata.TransparentRgb24.HasValue)
{
alpha.Clear();
- Rgb24 rgb = pngMetaData.TransparentRgb24.Value;
+ Rgb24 rgb = pngMetadata.TransparentRgb24.Value;
alpha[1] = rgb.R;
alpha[3] = rgb.G;
alpha[5] = rgb.B;
this.WriteChunk(stream, PngChunkType.Transparency, this.chunkDataBuffer, 0, 6);
}
}
- else if (pngMetaData.ColorType == PngColorType.Grayscale)
+ else if (pngMetadata.ColorType == PngColorType.Grayscale)
{
- if (pngMetaData.TransparentGray16.HasValue && this.use16Bit)
+ if (pngMetadata.TransparentGray16.HasValue && this.use16Bit)
{
- BinaryPrimitives.WriteUInt16LittleEndian(alpha, pngMetaData.TransparentGray16.Value.PackedValue);
+ BinaryPrimitives.WriteUInt16LittleEndian(alpha, pngMetadata.TransparentGray16.Value.PackedValue);
this.WriteChunk(stream, PngChunkType.Transparency, this.chunkDataBuffer, 0, 2);
}
- else if (pngMetaData.TransparentGray8.HasValue)
+ else if (pngMetadata.TransparentGray8.HasValue)
{
alpha.Clear();
- alpha[1] = pngMetaData.TransparentGray8.Value.PackedValue;
+ alpha[1] = pngMetadata.TransparentGray8.Value.PackedValue;
this.WriteChunk(stream, PngChunkType.Transparency, this.chunkDataBuffer, 0, 2);
}
}
diff --git a/src/ImageSharp/Formats/Png/PngFormat.cs b/src/ImageSharp/Formats/Png/PngFormat.cs
index 210e2a837d..408e37802f 100644
--- a/src/ImageSharp/Formats/Png/PngFormat.cs
+++ b/src/ImageSharp/Formats/Png/PngFormat.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Png
///
/// Registers the image encoders, decoders and mime type detectors for the png format.
///
- public sealed class PngFormat : IImageFormat
+ public sealed class PngFormat : IImageFormat
{
private PngFormat()
{
@@ -32,6 +32,6 @@ private PngFormat()
public IEnumerable FileExtensions => PngConstants.FileExtensions;
///
- public PngMetaData CreateDefaultFormatMetaData() => new PngMetaData();
+ public PngMetadata CreateDefaultFormatMetadata() => new PngMetadata();
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/PngMetaData.cs b/src/ImageSharp/Formats/Png/PngMetaData.cs
index d5ab3d2554..dd951763f7 100644
--- a/src/ImageSharp/Formats/Png/PngMetaData.cs
+++ b/src/ImageSharp/Formats/Png/PngMetaData.cs
@@ -8,20 +8,20 @@ namespace SixLabors.ImageSharp.Formats.Png
///
/// Provides Png specific metadata information for the image.
///
- public class PngMetaData : IDeepCloneable
+ public class PngMetadata : IDeepCloneable
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- public PngMetaData()
+ public PngMetadata()
{
}
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The metadata to create an instance from.
- private PngMetaData(PngMetaData other)
+ private PngMetadata(PngMetadata other)
{
this.BitDepth = other.BitDepth;
this.ColorType = other.ColorType;
@@ -75,6 +75,6 @@ private PngMetaData(PngMetaData other)
public bool HasTrans { get; set; }
///
- public IDeepCloneable DeepClone() => new PngMetaData(this);
+ public IDeepCloneable DeepClone() => new PngMetadata(this);
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/IImageInfo.cs b/src/ImageSharp/IImageInfo.cs
index b1b1afc66f..b270c2c4de 100644
--- a/src/ImageSharp/IImageInfo.cs
+++ b/src/ImageSharp/IImageInfo.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0.
using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
namespace SixLabors.ImageSharp
{
@@ -30,6 +30,6 @@ public interface IImageInfo
///
/// Gets the metadata of the image.
///
- ImageMetaData MetaData { get; }
+ ImageMetadata Metadata { get; }
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Image.Decode.cs b/src/ImageSharp/Image.Decode.cs
index ffdab25e24..9e83d173f2 100644
--- a/src/ImageSharp/Image.Decode.cs
+++ b/src/ImageSharp/Image.Decode.cs
@@ -5,7 +5,7 @@
using System.Linq;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Memory;
@@ -25,13 +25,13 @@ public static partial class Image
/// The
/// The width of the image
/// The height of the image
- /// The
+ /// The
/// The result
internal static Image CreateUninitialized(
Configuration configuration,
int width,
int height,
- ImageMetaData metadata)
+ ImageMetadata metadata)
where TPixel : struct, IPixel
{
Buffer2D uninitializedMemoryBuffer =
diff --git a/src/ImageSharp/Image.WrapMemory.cs b/src/ImageSharp/Image.WrapMemory.cs
index 4bb24a126b..3d788bb73a 100644
--- a/src/ImageSharp/Image.WrapMemory.cs
+++ b/src/ImageSharp/Image.WrapMemory.cs
@@ -5,7 +5,7 @@
using System.Buffers;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp
@@ -24,18 +24,18 @@ public static partial class Image
/// The pixel memory.
/// The width of the memory image.
/// The height of the memory image.
- /// The .
+ /// The .
/// An instance
public static Image WrapMemory(
Configuration config,
Memory pixelMemory,
int width,
int height,
- ImageMetaData metaData)
+ ImageMetadata metadata)
where TPixel : struct, IPixel
{
var memorySource = new MemorySource(pixelMemory);
- return new Image(config, memorySource, width, height, metaData);
+ return new Image(config, memorySource, width, height, metadata);
}
///
@@ -55,7 +55,7 @@ public static Image WrapMemory(
int height)
where TPixel : struct, IPixel
{
- return WrapMemory(config, pixelMemory, width, height, new ImageMetaData());
+ return WrapMemory(config, pixelMemory, width, height, new ImageMetadata());
}
///
@@ -89,18 +89,18 @@ public static Image WrapMemory(
/// The that is being transferred to the image
/// The width of the memory image.
/// The height of the memory image.
- /// The
+ /// The
/// An instance
public static Image WrapMemory(
Configuration config,
IMemoryOwner pixelMemoryOwner,
int width,
int height,
- ImageMetaData metaData)
+ ImageMetadata metadata)
where TPixel : struct, IPixel
{
var memorySource = new MemorySource(pixelMemoryOwner, false);
- return new Image(config, memorySource, width, height, metaData);
+ return new Image(config, memorySource, width, height, metadata);
}
///
@@ -123,7 +123,7 @@ public static Image WrapMemory(
int height)
where TPixel : struct, IPixel
{
- return WrapMemory(config, pixelMemoryOwner, width, height, new ImageMetaData());
+ return WrapMemory(config, pixelMemoryOwner, width, height, new ImageMetadata());
}
///
diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index bbe05ce435..7e516434cb 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -192,7 +192,7 @@ public Image ExportFrame(int index)
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.DeepClone(), new[] { frame });
}
///
@@ -205,7 +205,7 @@ public Image CloneFrame(int index)
{
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.DeepClone(), new[] { clonedFrame });
}
///
diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index f69ae37574..4f0be59713 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.ParallelUtils;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Memory;
@@ -30,7 +30,7 @@ public sealed class ImageFrame : IPixelSource, IDisposable
/// The width of the image in pixels.
/// The height of the image in pixels.
internal ImageFrame(Configuration configuration, int width, int height)
- : this(configuration, width, height, new ImageFrameMetaData())
+ : this(configuration, width, height, new ImageFrameMetadata())
{
}
@@ -39,9 +39,9 @@ internal ImageFrame(Configuration configuration, int width, int height)
///
/// The configuration which allows altering default behaviour or extending the library.
/// The of the frame.
- /// The meta data.
- internal ImageFrame(Configuration configuration, Size size, ImageFrameMetaData metaData)
- : this(configuration, size.Width, size.Height, metaData)
+ /// The metadata.
+ internal ImageFrame(Configuration configuration, Size size, ImageFrameMetadata metadata)
+ : this(configuration, size.Width, size.Height, metadata)
{
}
@@ -51,9 +51,9 @@ internal ImageFrame(Configuration configuration, Size size, ImageFrameMetaData m
/// The configuration which allows altering default behaviour or extending the library.
/// The width of the image in pixels.
/// The height of the image in pixels.
- /// The meta data.
- internal ImageFrame(Configuration configuration, int width, int height, ImageFrameMetaData metaData)
- : this(configuration, width, height, default(TPixel), metaData)
+ /// The metadata.
+ internal ImageFrame(Configuration configuration, int width, int height, ImageFrameMetadata metadata)
+ : this(configuration, width, height, default(TPixel), metadata)
{
}
@@ -65,7 +65,7 @@ internal ImageFrame(Configuration configuration, int width, int height, ImageFra
/// The height of the image in pixels.
/// The color to clear the image with.
internal ImageFrame(Configuration configuration, int width, int height, TPixel backgroundColor)
- : this(configuration, width, height, backgroundColor, new ImageFrameMetaData())
+ : this(configuration, width, height, backgroundColor, new ImageFrameMetadata())
{
}
@@ -76,8 +76,8 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel b
/// The width of the image in pixels.
/// The height of the image in pixels.
/// The color to clear the image with.
- /// The meta data.
- internal ImageFrame(Configuration configuration, int width, int height, TPixel backgroundColor, ImageFrameMetaData metaData)
+ /// The metadata.
+ internal ImageFrame(Configuration configuration, int width, int height, TPixel backgroundColor, ImageFrameMetadata metadata)
{
Guard.NotNull(configuration, nameof(configuration));
Guard.MustBeGreaterThan(width, 0, nameof(width));
@@ -86,7 +86,7 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel b
this.Configuration = configuration;
this.MemoryAllocator = configuration.MemoryAllocator;
this.PixelBuffer = this.MemoryAllocator.Allocate2D(width, height);
- this.MetaData = metaData ?? new ImageFrameMetaData();
+ this.Metadata = metadata ?? new ImageFrameMetadata();
this.Clear(configuration.GetParallelOptions(), backgroundColor);
}
@@ -98,7 +98,7 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel b
/// The height of the image in pixels.
/// The memory source.
internal ImageFrame(Configuration configuration, int width, int height, MemorySource memorySource)
- : this(configuration, width, height, memorySource, new ImageFrameMetaData())
+ : this(configuration, width, height, memorySource, new ImageFrameMetadata())
{
}
@@ -109,18 +109,18 @@ internal ImageFrame(Configuration configuration, int width, int height, MemorySo
/// The width of the image in pixels.
/// The height of the image in pixels.
/// The memory source.
- /// The meta data.
- internal ImageFrame(Configuration configuration, int width, int height, MemorySource memorySource, ImageFrameMetaData metaData)
+ /// The metadata.
+ internal ImageFrame(Configuration configuration, int width, int height, MemorySource memorySource, ImageFrameMetadata metadata)
{
Guard.NotNull(configuration, nameof(configuration));
Guard.MustBeGreaterThan(width, 0, nameof(width));
Guard.MustBeGreaterThan(height, 0, nameof(height));
- Guard.NotNull(metaData, nameof(metaData));
+ Guard.NotNull(metadata, nameof(metadata));
this.Configuration = configuration;
this.MemoryAllocator = configuration.MemoryAllocator;
this.PixelBuffer = new Buffer2D(memorySource, width, height);
- this.MetaData = metaData;
+ this.Metadata = metadata;
}
///
@@ -137,7 +137,7 @@ internal ImageFrame(Configuration configuration, ImageFrame source)
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.DeepClone();
}
///
@@ -169,9 +169,9 @@ internal ImageFrame(Configuration configuration, ImageFrame source)
public int Height => this.PixelBuffer.Height;
///
- /// Gets the meta data of the frame.
+ /// Gets the metadata of the frame.
///
- public ImageFrameMetaData MetaData { get; }
+ public ImageFrameMetadata Metadata { get; }
///
/// Gets or sets the pixel at the specified position.
@@ -289,7 +289,7 @@ internal ImageFrame CloneAs(Configuration configuration)
return this.Clone(configuration) as ImageFrame;
}
- var target = new ImageFrame(configuration, this.Width, this.Height, this.MetaData.DeepClone());
+ var target = new ImageFrame(configuration, this.Width, this.Height, this.Metadata.DeepClone());
ParallelHelper.IterateRows(
this.Bounds(),
diff --git a/src/ImageSharp/ImageInfo.cs b/src/ImageSharp/ImageInfo.cs
index 6f894cb599..12dcf1ed74 100644
--- a/src/ImageSharp/ImageInfo.cs
+++ b/src/ImageSharp/ImageInfo.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0.
using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
namespace SixLabors.ImageSharp
{
@@ -17,13 +17,13 @@ internal sealed class ImageInfo : IImageInfo
/// The image pixel type information.
/// The width of the image in pixels.
/// The height of the image in pixels.
- /// The images metadata.
- public ImageInfo(PixelTypeInfo pixelType, int width, int height, ImageMetaData metaData)
+ /// The images metadata.
+ public ImageInfo(PixelTypeInfo pixelType, int width, int height, ImageMetadata metadata)
{
this.PixelType = pixelType;
this.Width = width;
this.Height = height;
- this.MetaData = metaData;
+ this.Metadata = metadata;
}
///
@@ -36,6 +36,6 @@ public ImageInfo(PixelTypeInfo pixelType, int width, int height, ImageMetaData m
public int Height { get; }
///
- public ImageMetaData MetaData { get; }
+ public ImageMetadata Metadata { get; }
}
}
\ No newline at end of file
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index 178194b21e..f2bef78e1a 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -9,7 +9,7 @@
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp
@@ -31,7 +31,7 @@ public sealed class Image : IImage, IConfigurable
/// The width of the image in pixels.
/// The height of the image in pixels.
public Image(Configuration configuration, int width, int height)
- : this(configuration, width, height, new ImageMetaData())
+ : this(configuration, width, height, new ImageMetadata())
{
}
@@ -44,7 +44,7 @@ public Image(Configuration configuration, int width, int height)
/// The height of the image in pixels.
/// The color to initialize the pixels with.
public Image(Configuration configuration, int width, int height, TPixel backgroundColor)
- : this(configuration, width, height, backgroundColor, new ImageMetaData())
+ : this(configuration, width, height, backgroundColor, new ImageMetadata())
{
}
@@ -67,11 +67,11 @@ public Image(int width, int height)
/// The width of the image in pixels.
/// The height of the image in pixels.
/// The images metadata.
- internal Image(Configuration configuration, int width, int height, ImageMetaData metadata)
+ internal Image(Configuration configuration, int width, int height, ImageMetadata metadata)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf() * 8);
- this.MetaData = metadata ?? new ImageMetaData();
+ this.Metadata = metadata ?? new ImageMetadata();
this.Frames = new ImageFrameCollection(this, width, height, default(TPixel));
}
@@ -84,11 +84,11 @@ internal Image(Configuration configuration, int width, int height, ImageMetaData
/// The width of the image in pixels.
/// The height of the image in pixels.
/// The images metadata.
- internal Image(Configuration configuration, MemorySource memorySource, int width, int height, ImageMetaData metadata)
+ internal Image(Configuration configuration, MemorySource memorySource, int width, int height, ImageMetadata metadata)
{
this.configuration = configuration;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf() * 8);
- this.MetaData = metadata;
+ this.Metadata = metadata;
this.Frames = new ImageFrameCollection(this, width, height, memorySource);
}
@@ -101,11 +101,11 @@ internal Image(Configuration configuration, MemorySource memorySource, i
/// The height of the image in pixels.
/// The color to initialize the pixels with.
/// The images metadata.
- internal Image(Configuration configuration, int width, int height, TPixel backgroundColor, ImageMetaData metadata)
+ internal Image(Configuration configuration, int width, int height, TPixel backgroundColor, ImageMetadata metadata)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf() * 8);
- this.MetaData = metadata ?? new ImageMetaData();
+ this.Metadata = metadata ?? new ImageMetadata();
this.Frames = new ImageFrameCollection(this, width, height, backgroundColor);
}
@@ -116,11 +116,11 @@ internal Image(Configuration configuration, int width, int height, TPixel backgr
/// The configuration providing initialization code which allows extending the library.
/// The images metadata.
/// The frames that will be owned by this image instance.
- internal Image(Configuration configuration, ImageMetaData metadata, IEnumerable> frames)
+ internal Image(Configuration configuration, ImageMetadata metadata, IEnumerable> frames)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf() * 8);
- this.MetaData = metadata ?? new ImageMetaData();
+ this.Metadata = metadata ?? new ImageMetadata();
this.Frames = new ImageFrameCollection(this, frames);
}
@@ -140,7 +140,7 @@ internal Image(Configuration configuration, ImageMetaData metadata, IEnumerable<
public int Height => this.Frames.RootFrame.Height;
///
- public ImageMetaData MetaData { get; }
+ public ImageMetadata Metadata { get; }
///
/// Gets the frames.
@@ -193,7 +193,7 @@ public void Save(Stream stream, IImageEncoder encoder)
public Image Clone(Configuration configuration)
{
IEnumerable> clonedFrames = this.Frames.Select(x => x.Clone(configuration));
- return new Image(configuration, this.MetaData.DeepClone(), clonedFrames);
+ return new Image(configuration, this.Metadata.DeepClone(), clonedFrames);
}
///
@@ -214,7 +214,7 @@ public Image CloneAs(Configuration configuration)
where TPixel2 : struct, IPixel
{
IEnumerable> clonedFrames = this.Frames.Select(x => x.CloneAs(configuration));
- return new Image(configuration, this.MetaData.DeepClone(), clonedFrames);
+ return new Image(configuration, this.Metadata.DeepClone(), clonedFrames);
}
///
diff --git a/src/ImageSharp/MetaData/FrameDecodingMode.cs b/src/ImageSharp/MetaData/FrameDecodingMode.cs
index 2863fbf8f9..835e43354a 100644
--- a/src/ImageSharp/MetaData/FrameDecodingMode.cs
+++ b/src/ImageSharp/MetaData/FrameDecodingMode.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData
+namespace SixLabors.ImageSharp.Metadata
{
///
/// Enumerated frame process modes to apply to multi-frame images.
diff --git a/src/ImageSharp/MetaData/ImageFrameMetaData.cs b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
index f1f884be68..3858a7d0a3 100644
--- a/src/ImageSharp/MetaData/ImageFrameMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
@@ -4,62 +4,62 @@
using System.Collections.Generic;
using SixLabors.ImageSharp.Formats;
-namespace SixLabors.ImageSharp.MetaData
+namespace SixLabors.ImageSharp.Metadata
{
///
/// Encapsulates the metadata of an image frame.
///
- public sealed class ImageFrameMetaData : IDeepCloneable
+ public sealed class ImageFrameMetadata : IDeepCloneable
{
- private readonly Dictionary formatMetaData = new Dictionary();
+ private readonly Dictionary formatMetadata = new Dictionary();
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- internal ImageFrameMetaData()
+ internal ImageFrameMetadata()
{
}
///
- /// Initializes a new instance of the class
+ /// Initializes a new instance of the class
/// by making a copy from other metadata.
///
///
- /// The other to create this instance from.
+ /// The other to create this instance from.
///
- internal ImageFrameMetaData(ImageFrameMetaData other)
+ internal ImageFrameMetadata(ImageFrameMetadata other)
{
DebugGuard.NotNull(other, nameof(other));
- foreach (KeyValuePair meta in other.formatMetaData)
+ foreach (KeyValuePair meta in other.formatMetadata)
{
- this.formatMetaData.Add(meta.Key, meta.Value.DeepClone());
+ this.formatMetadata.Add(meta.Key, meta.Value.DeepClone());
}
}
///
- public ImageFrameMetaData DeepClone() => new ImageFrameMetaData(this);
+ public ImageFrameMetadata DeepClone() => new ImageFrameMetadata(this);
///
/// Gets the metadata value associated with the specified key.
///
- /// The type of format metadata.
- /// The type of format frame metadata.
+ /// The type of format metadata.
+ /// The type of format frame metadata.
/// The key of the value to get.
///
- /// The .
+ /// The .
///
- public TFormatFrameMetaData GetFormatMetaData(IImageFormat key)
- where TFormatMetaData : class
- where TFormatFrameMetaData : class, IDeepCloneable
+ public TFormatFrameMetadata GetFormatMetadata(IImageFormat key)
+ where TFormatMetadata : class
+ where TFormatFrameMetadata : class, IDeepCloneable
{
- if (this.formatMetaData.TryGetValue(key, out IDeepCloneable meta))
+ if (this.formatMetadata.TryGetValue(key, out IDeepCloneable meta))
{
- return (TFormatFrameMetaData)meta;
+ return (TFormatFrameMetadata)meta;
}
- TFormatFrameMetaData newMeta = key.CreateDefaultFormatFrameMetaData();
- this.formatMetaData[key] = newMeta;
+ TFormatFrameMetadata newMeta = key.CreateDefaultFormatFrameMetadata();
+ this.formatMetadata[key] = newMeta;
return newMeta;
}
}
diff --git a/src/ImageSharp/MetaData/ImageMetaData.cs b/src/ImageSharp/MetaData/ImageMetaData.cs
index 73549d98aa..b9efca4fee 100644
--- a/src/ImageSharp/MetaData/ImageMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageMetaData.cs
@@ -3,15 +3,15 @@
using System.Collections.Generic;
using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
-using SixLabors.ImageSharp.MetaData.Profiles.Icc;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
-namespace SixLabors.ImageSharp.MetaData
+namespace SixLabors.ImageSharp.Metadata
{
///
/// Encapsulates the metadata of an image.
///
- public sealed class ImageMetaData : IDeepCloneable
+ public sealed class ImageMetadata : IDeepCloneable
{
///
/// The default horizontal resolution value (dots per inch) in x direction.
@@ -31,14 +31,14 @@ public sealed class ImageMetaData : IDeepCloneable
///
public const PixelResolutionUnit DefaultPixelResolutionUnits = PixelResolutionUnit.PixelsPerInch;
- private readonly Dictionary formatMetaData = new Dictionary();
+ private readonly Dictionary formatMetadata = new Dictionary();
private double horizontalResolution;
private double verticalResolution;
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
- internal ImageMetaData()
+ internal ImageMetadata()
{
this.horizontalResolution = DefaultHorizontalResolution;
this.verticalResolution = DefaultVerticalResolution;
@@ -46,21 +46,21 @@ internal ImageMetaData()
}
///
- /// Initializes a new instance of the class
+ /// Initializes a new instance of the class
/// by making a copy from other metadata.
///
///
- /// The other to create this instance from.
+ /// The other to create this instance from.
///
- private ImageMetaData(ImageMetaData other)
+ private ImageMetadata(ImageMetadata other)
{
this.HorizontalResolution = other.HorizontalResolution;
this.VerticalResolution = other.VerticalResolution;
this.ResolutionUnits = other.ResolutionUnits;
- foreach (KeyValuePair meta in other.formatMetaData)
+ foreach (KeyValuePair meta in other.formatMetadata)
{
- this.formatMetaData.Add(meta.Key, meta.Value.DeepClone());
+ this.formatMetadata.Add(meta.Key, meta.Value.DeepClone());
}
foreach (ImageProperty property in other.Properties)
@@ -135,26 +135,26 @@ public double VerticalResolution
///
/// Gets the metadata value associated with the specified key.
///
- /// The type of metadata.
+ /// The type of metadata.
/// The key of the value to get.
///
- /// The .
+ /// The .
///
- public TFormatMetaData GetFormatMetaData(IImageFormat key)
- where TFormatMetaData : class, IDeepCloneable
+ public TFormatMetadata GetFormatMetadata(IImageFormat key)
+ where TFormatMetadata : class, IDeepCloneable
{
- if (this.formatMetaData.TryGetValue(key, out IDeepCloneable meta))
+ if (this.formatMetadata.TryGetValue(key, out IDeepCloneable meta))
{
- return (TFormatMetaData)meta;
+ return (TFormatMetadata)meta;
}
- TFormatMetaData newMeta = key.CreateDefaultFormatMetaData();
- this.formatMetaData[key] = newMeta;
+ TFormatMetadata newMeta = key.CreateDefaultFormatMetadata();
+ this.formatMetadata[key] = newMeta;
return newMeta;
}
///
- public ImageMetaData DeepClone() => new ImageMetaData(this);
+ public ImageMetadata DeepClone() => new ImageMetadata(this);
///
/// Looks up a property with the provided name.
@@ -180,7 +180,7 @@ internal bool TryGetProperty(string name, out ImageProperty result)
}
///
- /// Synchronizes the profiles with the current meta data.
+ /// Synchronizes the profiles with the current metadata.
///
internal void SyncProfiles() => this.ExifProfile?.Sync(this);
}
diff --git a/src/ImageSharp/MetaData/ImageProperty.cs b/src/ImageSharp/MetaData/ImageProperty.cs
index 6d38b6bf13..905e42dab1 100644
--- a/src/ImageSharp/MetaData/ImageProperty.cs
+++ b/src/ImageSharp/MetaData/ImageProperty.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData
+namespace SixLabors.ImageSharp.Metadata
{
///
/// Stores meta information about a image, like the name of the author,
diff --git a/src/ImageSharp/MetaData/PixelResolutionUnit.cs b/src/ImageSharp/MetaData/PixelResolutionUnit.cs
index ce848004f7..661e7a308e 100644
--- a/src/ImageSharp/MetaData/PixelResolutionUnit.cs
+++ b/src/ImageSharp/MetaData/PixelResolutionUnit.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData
+namespace SixLabors.ImageSharp.Metadata
{
///
/// Provides enumeration of available pixel density units.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifConstants.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifConstants.cs
index fb2a893d1c..c7112c47a3 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifConstants.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifConstants.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
internal static class ExifConstants
{
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifDataType.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifDataType.cs
index 5bd38b195d..83e7f7fe8b 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifDataType.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifDataType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Specifies exif data types.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifParts.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifParts.cs
index b1b42ad433..d22dc730f9 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifParts.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifParts.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Specifies which parts will be written when the profile is added to an image.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
index 37ceaf10f6..3d90cb3a9e 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
@@ -7,7 +7,7 @@
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Primitives;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Represents an EXIF profile providing access to the collection of values.
@@ -249,13 +249,13 @@ public byte[] ToByteArray()
public ExifProfile DeepClone() => new ExifProfile(this);
///
- /// Synchronizes the profiles with the specified meta data.
+ /// Synchronizes the profiles with the specified metadata.
///
- /// The meta data.
- internal void Sync(ImageMetaData metaData)
+ /// The metadata.
+ internal void Sync(ImageMetadata metadata)
{
- this.SyncResolution(ExifTag.XResolution, metaData.HorizontalResolution);
- this.SyncResolution(ExifTag.YResolution, metaData.VerticalResolution);
+ this.SyncResolution(ExifTag.XResolution, metadata.HorizontalResolution);
+ this.SyncResolution(ExifTag.YResolution, metadata.VerticalResolution);
}
private void SyncResolution(ExifTag tag, double resolution)
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
index cf95affb04..e40e6c26c2 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
@@ -10,7 +10,7 @@
using System.Text;
using SixLabors.ImageSharp.Primitives;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Reads and parses EXIF data from a byte array.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifTag.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifTag.cs
index 625f95b63d..ddd4591fac 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifTag.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifTag.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// All exif tags from the Exif standard 2.2
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifTagDescriptionAttribute.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifTagDescriptionAttribute.cs
index 286fdbe57f..0188c662ed 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifTagDescriptionAttribute.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifTagDescriptionAttribute.cs
@@ -4,7 +4,7 @@
using System;
using System.Reflection;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Class that provides a description for an ExifTag value.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifTags.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifTags.cs
index e999d00b86..0ed3a43b70 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifTags.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifTags.cs
@@ -1,9 +1,9 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-using static SixLabors.ImageSharp.MetaData.Profiles.Exif.ExifTag;
+using static SixLabors.ImageSharp.Metadata.Profiles.Exif.ExifTag;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
internal static class ExifTags
{
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
index 409c55253a..05a9f35c9b 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
@@ -6,7 +6,7 @@
using System.Text;
using SixLabors.ImageSharp.Primitives;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Represent the value of the EXIF profile.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs
index 9079526d5a..93fe7fbbee 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs
@@ -7,7 +7,7 @@
using System.Text;
using SixLabors.ImageSharp.Primitives;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
{
///
/// Contains methods for writing EXIF metadata.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccCurveSegment.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccCurveSegment.cs
index 516887bcd6..7bf1f84211 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccCurveSegment.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccCurveSegment.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A segment of a curve
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccFormulaCurveElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccFormulaCurveElement.cs
index d168c5c285..d013f6ef13 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccFormulaCurveElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccFormulaCurveElement.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A formula based curve segment
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs
index 7076e51447..e1d362a7fe 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A one dimensional ICC curve.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs
index efc2ca5377..04a9faf7da 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A parametric curve
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs
index de08485ac8..4f0345d352 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs
@@ -5,7 +5,7 @@
using System.Linq;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A response curve
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs
index d9badf5a80..4872bd2b08 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A sampled curve segment
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Curves.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Curves.cs
index b27083dc49..111911080e 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Curves.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Curves.cs
@@ -3,7 +3,7 @@
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs
index f9d56b0fff..5262e3ee95 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Matrix.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Matrix.cs
index 495d73a784..3157b9ef38 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Matrix.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Matrix.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.MultiProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.MultiProcessElement.cs
index 2b39b1d6c6..4253058288 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.MultiProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.MultiProcessElement.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.NonPrimitives.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.NonPrimitives.cs
index 7dc8cf98aa..aacbbcc1dd 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.NonPrimitives.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.NonPrimitives.cs
@@ -4,7 +4,7 @@
using System;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Primitives.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Primitives.cs
index bb85a5ca3e..2cbf798ec2 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Primitives.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Primitives.cs
@@ -6,7 +6,7 @@
using System.Runtime.CompilerServices;
using System.Text;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs
index c572b7f210..3f330ef729 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs
@@ -5,7 +5,7 @@
using System.Globalization;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs
index 91a28fd743..7d694bec6e 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs
@@ -4,7 +4,7 @@
using System;
using System.Text;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to read ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs
index d5f5d5a9b6..c48ba8ab7c 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs
@@ -3,7 +3,7 @@
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs
index 38a3dd457d..016bd8009a 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Matrix.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Matrix.cs
index 79b9132192..b0bd377cb3 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Matrix.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Matrix.cs
@@ -4,7 +4,7 @@
using System.Numerics;
using SixLabors.ImageSharp.Primitives;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs
index 48c6734aec..824a9bef61 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs
index 1a3c2c0ac5..e681f84b85 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs
@@ -4,7 +4,7 @@
using System;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs
index 404285b500..6c49eb0c43 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs
@@ -4,7 +4,7 @@
using System;
using System.Text;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs
index 51ea2d4e4a..13fb023d38 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs
@@ -3,7 +3,7 @@
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.cs
index 21b7b6421b..17f15df714 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Provides methods to write ICC data types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccClutDataType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccClutDataType.cs
index fe0c9b8b59..71e68f6af1 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccClutDataType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccClutDataType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Color lookup table data type
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorSpaceType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorSpaceType.cs
index 0913cda418..721545df36 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorSpaceType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorSpaceType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Color Space Type
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorantEncoding.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorantEncoding.cs
index bec71e0dbc..14b2dd960f 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorantEncoding.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccColorantEncoding.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Colorant Encoding
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveMeasurementEncodings.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveMeasurementEncodings.cs
index cfd2671e94..a620632da6 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveMeasurementEncodings.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveMeasurementEncodings.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Curve Measurement Encodings
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveSegmentSignature.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveSegmentSignature.cs
index e9b8cc26b8..9a5ae18052 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveSegmentSignature.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccCurveSegmentSignature.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Curve Segment Signature
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDataType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDataType.cs
index b13edb53f4..de1f116366 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDataType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDataType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Enumerates the basic data types as defined in ICC.1:2010 version 4.3.0.0
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDeviceAttribute.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDeviceAttribute.cs
index 88cca866dc..c8598b0e03 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDeviceAttribute.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccDeviceAttribute.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Device attributes. Can be combined with a logical OR
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccFormulaCurveType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccFormulaCurveType.cs
index 2a375b0d1c..11e5985af3 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccFormulaCurveType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccFormulaCurveType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Formula curve segment type
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMeasurementGeometry.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMeasurementGeometry.cs
index fe6575c41b..9373241949 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMeasurementGeometry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMeasurementGeometry.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Measurement Geometry
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMultiProcessElementSignature.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMultiProcessElementSignature.cs
index fe5d309228..d7f78889dc 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMultiProcessElementSignature.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccMultiProcessElementSignature.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Multi process element signature
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccParametricCurveType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccParametricCurveType.cs
index 374b4ad93b..fce08a3afe 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccParametricCurveType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccParametricCurveType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Formula curve segment type
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccPrimaryPlatformType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccPrimaryPlatformType.cs
index 1563078f72..035fd3d4d2 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccPrimaryPlatformType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccPrimaryPlatformType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Enumerates the primary platform/operating system framework for which the profile was created
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileClass.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileClass.cs
index 8f0427db27..3d59192a7b 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileClass.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileClass.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Profile Class Name
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileFlag.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileFlag.cs
index 1e9ec18e89..9fbe5b5b5a 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileFlag.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileFlag.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Profile flags. Can be combined with a logical OR.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileTag.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileTag.cs
index 61d34dca10..b19641e0fb 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileTag.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccProfileTag.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0.
// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Enumerates the ICC Profile Tags as defined in ICC.1:2010 version 4.3.0.0
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccRenderingIntent.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccRenderingIntent.cs
index 7cb9c00f39..8ae241b448 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccRenderingIntent.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccRenderingIntent.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Rendering intent
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningFlag.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningFlag.cs
index 839ab8c6b1..b43ad52c48 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningFlag.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningFlag.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Screening flags. Can be combined with a logical OR.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningSpotType.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningSpotType.cs
index f1d73c6268..0631892b62 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningSpotType.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccScreeningSpotType.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Enumerates the screening spot types
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccSignatureName.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccSignatureName.cs
index 4773ab6c2a..f93d22f3e4 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccSignatureName.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccSignatureName.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Signature Name
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardIlluminant.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardIlluminant.cs
index fe0c406576..fc8ebae5cd 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardIlluminant.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardIlluminant.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Standard Illuminant
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardObserver.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardObserver.cs
index a393c258b2..1454b28273 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardObserver.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccStandardObserver.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Standard Observer
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccTypeSignature.cs b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccTypeSignature.cs
index ad0db4df93..d7a18579e5 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccTypeSignature.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Enums/IccTypeSignature.cs
@@ -1,7 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Type Signature
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Exceptions/InvalidIccProfileException.cs b/src/ImageSharp/MetaData/Profiles/ICC/Exceptions/InvalidIccProfileException.cs
index f690670419..019bf9202c 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Exceptions/InvalidIccProfileException.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Exceptions/InvalidIccProfileException.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Represents an error that happened while reading or writing a corrupt/invalid ICC profile
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
index 5d75a6df9d..afdd7ebfb5 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
@@ -4,7 +4,7 @@
using System;
using System.Security.Cryptography;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Represents an ICC profile
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccProfileHeader.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccProfileHeader.cs
index 189b40275a..326dd351e7 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccProfileHeader.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccProfileHeader.cs
@@ -4,7 +4,7 @@
using System;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Contains all values of an ICC profile header.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs
index 9f9d373ae1..30a6de40d0 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Reads and parses ICC data from a byte array
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccTagDataEntry.cs
index 4c6bb07858..658d4c2f1b 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The data of an ICC tag entry
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
index 91a3bba549..b5a7c830dd 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Contains methods for writing ICC profiles.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccBAcsProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccBAcsProcessElement.cs
index 09931a1f91..c825a35352 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccBAcsProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccBAcsProcessElement.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A placeholder (might be used for future ICC versions)
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs
index 6aba186326..7ee7f821d7 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A CLUT (color lookup table) element to process data
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs
index 7585fc2128..d72aff3c92 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A set of curves to process data
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccEAcsProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccEAcsProcessElement.cs
index 7e0e1eda82..d6f42aea76 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccEAcsProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccEAcsProcessElement.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A placeholder (might be used for future ICC versions)
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs
index e6170f7680..0d8683397a 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs
@@ -5,7 +5,7 @@
using SixLabors.ImageSharp.Primitives;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A matrix element to process data
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMultiProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMultiProcessElement.cs
index db2d56cc3d..24649d8b50 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMultiProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMultiProcessElement.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// An element to process data
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs
index e9a812d8ca..b4d711f59e 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The chromaticity tag type provides basic chromaticity data
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs
index b5f8fd5c49..4136b9a389 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This tag specifies the laydown order in which colorants
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantTableTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantTableTagDataEntry.cs
index 9f2b4c90ad..28d01450c1 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantTableTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantTableTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The purpose of this tag is to identify the colorants used in
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCrdInfoTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCrdInfoTagDataEntry.cs
index 4d393dfb33..bcf9d5c9e1 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCrdInfoTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCrdInfoTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type contains the PostScript product name to which this profile
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs
index 0d34d3ceba..f2205cbad5 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The type contains a one-dimensional table of double values.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs
index 0b8367303d..6a0b6c05e8 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Text;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The dataType is a simple data structure that contains
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDateTimeTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDateTimeTagDataEntry.cs
index 104d243099..371397a6f8 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDateTimeTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDateTimeTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type is a representation of the time and date.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs
index 0a114ea1f9..50bfca1756 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents an array of doubles (from 32bit fixed point values).
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut16TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut16TagDataEntry.cs
index 415f6941ec..d84fc1431e 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut16TagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut16TagDataEntry.cs
@@ -5,7 +5,7 @@
using System.Linq;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This structure represents a color transform using tables
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut8TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut8TagDataEntry.cs
index 04a49e316d..5c8ce2d2c9 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut8TagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLut8TagDataEntry.cs
@@ -5,7 +5,7 @@
using System.Linq;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This structure represents a color transform using tables
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs
index f7c0946320..4cee555e51 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs
@@ -5,7 +5,7 @@
using System.Linq;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This structure represents a color transform.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutBToATagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutBToATagDataEntry.cs
index 27572acd0b..8e9479ff83 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutBToATagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutBToATagDataEntry.cs
@@ -5,7 +5,7 @@
using System.Linq;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This structure represents a color transform.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMeasurementTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMeasurementTagDataEntry.cs
index 9247ca593f..ad3a9f2c36 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMeasurementTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMeasurementTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The measurementType information refers only to the internal
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs
index 1a06eb5880..3084ff6121 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This tag structure contains a set of records each referencing
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiProcessElementsTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiProcessElementsTagDataEntry.cs
index f13fdb17fb..dc78e75200 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiProcessElementsTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiProcessElementsTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This structure represents a color transform, containing
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccNamedColor2TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccNamedColor2TagDataEntry.cs
index 957b8d5c3f..30516578fe 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccNamedColor2TagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccNamedColor2TagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The namedColor2Type is a count value and array of structures
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccParametricCurveTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccParametricCurveTagDataEntry.cs
index 9ec497d3be..752d05aae2 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccParametricCurveTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccParametricCurveTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The parametricCurveType describes a one-dimensional curve by
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs
index ff69115267..3c3a6c7619 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type is an array of structures, each of which contains information
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs
index c6cc0903c5..06e52cb637 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type is an array of structures, each of which contains information
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccResponseCurveSet16TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccResponseCurveSet16TagDataEntry.cs
index 494aa2888b..6051bf8414 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccResponseCurveSet16TagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccResponseCurveSet16TagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The purpose of this tag type is to provide a mechanism to relate physical
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs
index a073291ad1..bf64e4fed0 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type describes various screening parameters including
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs
index 287f0efb0c..87d369f85b 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Typically this type is used for registered tags that can
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs
index 8e6f4bc196..4134779c3c 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextDescriptionTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Globalization;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The TextDescriptionType contains three types of text description.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs
index ab3b3fb6fb..6cf9e91543 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This is a simple text structure that contains a text string.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs
index 464cbb9e75..3e4a5ff3a9 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents an array of doubles (from 32bit values).
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs
index 1e7a7f8a90..46799b16a9 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents an array of unsigned shorts.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs
index affdc8720b..9fbbf8bf57 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents an array of unsigned 32bit integers.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs
index 36d48d6135..053181a26f 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents an array of unsigned 64bit integers.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs
index b2f2677575..099916d894 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents an array of bytes.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs
index 510930e397..d28b6edc96 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type contains curves representing the under color removal and black generation
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs
index a0089e7359..0227983fa1 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This tag stores data of an unknown tag data entry
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs
index bd636d4f2c..2b2893c388 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// This type represents a set of viewing condition parameters.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs
index c1c14d8cbb..505b73a89f 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs
@@ -4,7 +4,7 @@
using System;
using System.Numerics;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// The XYZType contains an array of XYZ values.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs
index 3f7cad3afe..c53ba95201 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Color Lookup Table
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs
index 4bcd1b6861..db1feea9ab 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Entry of ICC colorant table
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs
index 1920e97fe1..b2852c8a33 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs
@@ -4,7 +4,7 @@
using System;
using System.Globalization;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A string with a specific locale.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs
index c46d6884b6..9e0c6c40dd 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Lookup Table
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccNamedColor.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccNamedColor.cs
index b7cb5bc495..22bf1bb762 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccNamedColor.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccNamedColor.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A specific color with a name
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccPositionNumber.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccPositionNumber.cs
index 745312f563..c9b75903d9 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccPositionNumber.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccPositionNumber.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Position of an object within an ICC profile
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileDescription.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileDescription.cs
index 7e7c527ead..76ac5961d9 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileDescription.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileDescription.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// ICC Profile description
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs
index 710e6bb252..4a73f7e079 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// ICC Profile ID
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileSequenceIdentifier.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileSequenceIdentifier.cs
index ae451c5db8..9eb9fc7c3e 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileSequenceIdentifier.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileSequenceIdentifier.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Description of a profile within a sequence.
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccResponseNumber.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccResponseNumber.cs
index 8cae869925..8590802638 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccResponseNumber.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccResponseNumber.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Associates a normalized device code with a measurement value
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs
index 7e2072d5bb..354442b476 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs
@@ -4,7 +4,7 @@
using System;
using System.Runtime.InteropServices;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// A single channel of a
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccTagTableEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccTagTableEntry.cs
index 7713c4faa1..889dec41eb 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccTagTableEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccTagTableEntry.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Entry of ICC tag table
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccVersion.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccVersion.cs
index 2486cc80a9..b388fa5a48 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccVersion.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccVersion.cs
@@ -3,7 +3,7 @@
using System;
-namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
+namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
///
/// Represents the ICC profile version number.
diff --git a/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
index 0f71c732dd..7633ed4418 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
@@ -53,10 +53,10 @@ protected override Image CreateDestination(Image source, Rectang
{
// 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.DeepClone()));
// 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.DeepClone(), frames);
}
///
diff --git a/src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs
index a610ae5bb3..5b9e3dde23 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0.
using System;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing.Processors;
using SixLabors.Primitives;
@@ -73,12 +73,12 @@ protected override void OnFrameApply(ImageFrame sourceBase, Rectangle so
/// The
private static OrientationMode GetExifOrientation(Image source)
{
- if (source.MetaData.ExifProfile is null)
+ if (source.Metadata.ExifProfile is null)
{
return OrientationMode.Unknown;
}
- ExifValue value = source.MetaData.ExifProfile.GetValue(ExifTag.Orientation);
+ ExifValue value = source.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
if (value is null)
{
return OrientationMode.Unknown;
@@ -92,10 +92,10 @@ private static OrientationMode GetExifOrientation(Image source)
else
{
orientation = (OrientationMode)Convert.ToUInt16(value.Value);
- source.MetaData.ExifProfile.RemoveValue(ExifTag.Orientation);
+ source.Metadata.ExifProfile.RemoveValue(ExifTag.Orientation);
}
- source.MetaData.ExifProfile.SetValue(ExifTag.Orientation, (ushort)OrientationMode.TopLeft);
+ source.Metadata.ExifProfile.SetValue(ExifTag.Orientation, (ushort)OrientationMode.TopLeft);
return orientation;
}
diff --git a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
index 3b1d7e94dd..5baa196a09 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
@@ -39,10 +39,10 @@ public CropProcessor(Rectangle cropRectangle, Size sourceSize)
protected override Image