Browse Source

renaming ImageFormatsManager to ImageFormatManager

af/merge-core
Vicente Penades 9 years ago
parent
commit
08fbee99fa
  1. 32
      src/ImageSharp/Configuration.cs
  2. 6
      src/ImageSharp/Formats/ImageFormatManager.cs
  3. 14
      tests/ImageSharp.Tests/Formats/ImageFormatManagerTests.cs

32
src/ImageSharp/Configuration.cs

@ -61,12 +61,12 @@ namespace SixLabors.ImageSharp
/// <summary> /// <summary>
/// Gets the currently registered <see cref="IImageFormat"/>s. /// Gets the currently registered <see cref="IImageFormat"/>s.
/// </summary> /// </summary>
public IEnumerable<IImageFormat> ImageFormats => this.FormatsManager.ImageFormats; public IEnumerable<IImageFormat> ImageFormats => this.ImageFormatsManager.ImageFormats;
/// <summary> /// <summary>
/// Gets or sets the <see cref="ImageFormatsManager"/> that is currently in use. /// Gets or sets the <see cref="ImageFormatManager"/> that is currently in use.
/// </summary> /// </summary>
public ImageFormatsManager FormatsManager { get; set; } = new ImageFormatsManager(); public ImageFormatManager ImageFormatsManager { get; set; } = new ImageFormatManager();
/// <summary> /// <summary>
/// Gets or sets the <see cref="MemoryManager"/> that is currently in use. /// Gets or sets the <see cref="MemoryManager"/> that is currently in use.
@ -76,22 +76,22 @@ namespace SixLabors.ImageSharp
/// <summary> /// <summary>
/// Gets the maximum header size of all the formats. /// Gets the maximum header size of all the formats.
/// </summary> /// </summary>
internal int MaxHeaderSize => this.FormatsManager.MaxHeaderSize; internal int MaxHeaderSize => this.ImageFormatsManager.MaxHeaderSize;
/// <summary> /// <summary>
/// Gets the currently registered <see cref="IImageFormatDetector"/>s. /// Gets the currently registered <see cref="IImageFormatDetector"/>s.
/// </summary> /// </summary>
internal IEnumerable<IImageFormatDetector> FormatDetectors => this.FormatsManager.FormatDetectors; internal IEnumerable<IImageFormatDetector> FormatDetectors => this.ImageFormatsManager.FormatDetectors;
/// <summary> /// <summary>
/// Gets the currently registered <see cref="IImageDecoder"/>s. /// Gets the currently registered <see cref="IImageDecoder"/>s.
/// </summary> /// </summary>
internal IEnumerable<KeyValuePair<IImageFormat, IImageDecoder>> ImageDecoders => this.FormatsManager.ImageDecoders; internal IEnumerable<KeyValuePair<IImageFormat, IImageDecoder>> ImageDecoders => this.ImageFormatsManager.ImageDecoders;
/// <summary> /// <summary>
/// Gets the currently registered <see cref="IImageEncoder"/>s. /// Gets the currently registered <see cref="IImageEncoder"/>s.
/// </summary> /// </summary>
internal IEnumerable<KeyValuePair<IImageFormat, IImageEncoder>> ImageEncoders => this.FormatsManager.ImageEncoders; internal IEnumerable<KeyValuePair<IImageFormat, IImageEncoder>> ImageEncoders => this.ImageFormatsManager.ImageEncoders;
#if !NETSTANDARD1_1 #if !NETSTANDARD1_1
/// <summary> /// <summary>
@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp
/// <param name="format">The format to register as a known format.</param> /// <param name="format">The format to register as a known format.</param>
public void AddImageFormat(IImageFormat format) public void AddImageFormat(IImageFormat format)
{ {
this.FormatsManager.AddImageFormat(format); this.ImageFormatsManager.AddImageFormat(format);
} }
/// <summary> /// <summary>
@ -131,7 +131,7 @@ namespace SixLabors.ImageSharp
/// <returns>The <see cref="IImageFormat"/> if found otherwise null</returns> /// <returns>The <see cref="IImageFormat"/> if found otherwise null</returns>
public IImageFormat FindFormatByFileExtension(string extension) public IImageFormat FindFormatByFileExtension(string extension)
{ {
return this.FormatsManager.FindFormatByFileExtension(extension); return this.ImageFormatsManager.FindFormatByFileExtension(extension);
} }
/// <summary> /// <summary>
@ -141,7 +141,7 @@ namespace SixLabors.ImageSharp
/// <returns>The <see cref="IImageFormat"/> if found; otherwise null</returns> /// <returns>The <see cref="IImageFormat"/> if found; otherwise null</returns>
public IImageFormat FindFormatByMimeType(string mimeType) public IImageFormat FindFormatByMimeType(string mimeType)
{ {
return this.FormatsManager.FindFormatByMimeType(mimeType); return this.ImageFormatsManager.FindFormatByMimeType(mimeType);
} }
/// <summary> /// <summary>
@ -151,7 +151,7 @@ namespace SixLabors.ImageSharp
/// <param name="encoder">The encoder to use,</param> /// <param name="encoder">The encoder to use,</param>
public void SetEncoder(IImageFormat imageFormat, IImageEncoder encoder) public void SetEncoder(IImageFormat imageFormat, IImageEncoder encoder)
{ {
this.FormatsManager.SetEncoder(imageFormat, encoder); this.ImageFormatsManager.SetEncoder(imageFormat, encoder);
} }
/// <summary> /// <summary>
@ -161,7 +161,7 @@ namespace SixLabors.ImageSharp
/// <param name="decoder">The decoder to use,</param> /// <param name="decoder">The decoder to use,</param>
public void SetDecoder(IImageFormat imageFormat, IImageDecoder decoder) public void SetDecoder(IImageFormat imageFormat, IImageDecoder decoder)
{ {
this.FormatsManager.SetDecoder(imageFormat, decoder); this.ImageFormatsManager.SetDecoder(imageFormat, decoder);
} }
/// <summary> /// <summary>
@ -169,7 +169,7 @@ namespace SixLabors.ImageSharp
/// </summary> /// </summary>
public void ClearImageFormatDetectors() public void ClearImageFormatDetectors()
{ {
this.FormatsManager.ClearImageFormatDetectors(); this.ImageFormatsManager.ClearImageFormatDetectors();
} }
/// <summary> /// <summary>
@ -178,7 +178,7 @@ namespace SixLabors.ImageSharp
/// <param name="detector">The detector to add</param> /// <param name="detector">The detector to add</param>
public void AddImageFormatDetector(IImageFormatDetector detector) public void AddImageFormatDetector(IImageFormatDetector detector)
{ {
this.FormatsManager.AddImageFormatDetector(detector); this.ImageFormatsManager.AddImageFormatDetector(detector);
} }
/// <summary> /// <summary>
@ -188,7 +188,7 @@ namespace SixLabors.ImageSharp
/// <returns>The <see cref="IImageDecoder"/> if found otherwise null</returns> /// <returns>The <see cref="IImageDecoder"/> if found otherwise null</returns>
public IImageDecoder FindDecoder(IImageFormat format) public IImageDecoder FindDecoder(IImageFormat format)
{ {
return this.FormatsManager.FindDecoder(format); return this.ImageFormatsManager.FindDecoder(format);
} }
/// <summary> /// <summary>
@ -198,7 +198,7 @@ namespace SixLabors.ImageSharp
/// <returns>The <see cref="IImageEncoder"/> if found otherwise null</returns> /// <returns>The <see cref="IImageEncoder"/> if found otherwise null</returns>
public IImageEncoder FindEncoder(IImageFormat format) public IImageEncoder FindEncoder(IImageFormat format)
{ {
return this.FormatsManager.FindEncoder(format); return this.ImageFormatsManager.FindEncoder(format);
} }
/// <summary> /// <summary>

6
src/ImageSharp/Formats/ImageFormatsManager.cs → src/ImageSharp/Formats/ImageFormatManager.cs

@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Formats
/// <summary> /// <summary>
/// Collection of Image Formats to be used in <see cref="Configuration" /> class. /// Collection of Image Formats to be used in <see cref="Configuration" /> class.
/// </summary> /// </summary>
public class ImageFormatsManager public class ImageFormatManager
{ {
/// <summary> /// <summary>
/// The list of supported <see cref="IImageEncoder"/> keyed to mime types. /// The list of supported <see cref="IImageEncoder"/> keyed to mime types.
@ -35,9 +35,9 @@ namespace SixLabors.ImageSharp.Formats
private ConcurrentBag<IImageFormatDetector> imageFormatDetectors = new ConcurrentBag<IImageFormatDetector>(); private ConcurrentBag<IImageFormatDetector> imageFormatDetectors = new ConcurrentBag<IImageFormatDetector>();
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ImageFormatsManager" /> class. /// Initializes a new instance of the <see cref="ImageFormatManager" /> class.
/// </summary> /// </summary>
public ImageFormatsManager() public ImageFormatManager()
{ {
} }

14
tests/ImageSharp.Tests/Formats/ImageFormatsManagerTests.cs → tests/ImageSharp.Tests/Formats/ImageFormatManagerTests.cs

@ -13,19 +13,19 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests namespace SixLabors.ImageSharp.Tests
{ {
public class ImageFormatsManagerTests public class ImageFormatManagerTests
{ {
public ImageFormatsManager FormatsManagerEmpty { get; private set; } public ImageFormatManager FormatsManagerEmpty { get; private set; }
public ImageFormatsManager DefaultFormatsManager { get; private set; } public ImageFormatManager DefaultFormatsManager { get; private set; }
public ImageFormatsManagerTests() public ImageFormatManagerTests()
{ {
this.DefaultFormatsManager = Configuration.Default.FormatsManager; this.DefaultFormatsManager = Configuration.Default.ImageFormatsManager;
this.FormatsManagerEmpty = new ImageFormatsManager(); this.FormatsManagerEmpty = new ImageFormatManager();
} }
[Fact] [Fact]
public void IfAutoloadWellknownFormatsIsTrueAllFormatsAreLoaded() public void IfAutoloadWellKnownFormatsIsTrueAllFormatsAreLoaded()
{ {
Assert.Equal(4, this.DefaultFormatsManager.ImageEncoders.Count()); Assert.Equal(4, this.DefaultFormatsManager.ImageEncoders.Count());
Assert.Equal(4, this.DefaultFormatsManager.ImageDecoders.Count()); Assert.Equal(4, this.DefaultFormatsManager.ImageDecoders.Count());
Loading…
Cancel
Save