Browse Source

Nicer initialization of the options.

pull/22/merge
Dirk Lemstra 10 years ago
committed by Dirk Lemstra
parent
commit
36dd507874
  1. 9
      src/ImageSharp.Formats.Gif/GifDecoderOptions.cs
  2. 9
      src/ImageSharp.Formats.Png/PngDecoderOptions.cs
  3. 15
      src/ImageSharp/Formats/DecoderOptions.cs
  4. 15
      src/ImageSharp/Formats/EncoderOptions.cs

9
src/ImageSharp.Formats.Gif/GifDecoderOptions.cs

@ -19,7 +19,6 @@ namespace ImageSharp.Formats
/// </summary> /// </summary>
public GifDecoderOptions() public GifDecoderOptions()
{ {
this.InitializeWithDefaults();
} }
/// <summary> /// <summary>
@ -29,13 +28,12 @@ namespace ImageSharp.Formats
private GifDecoderOptions(IDecoderOptions options) private GifDecoderOptions(IDecoderOptions options)
: base(options) : base(options)
{ {
this.InitializeWithDefaults();
} }
/// <summary> /// <summary>
/// Gets or sets the encoding that should be used when reading comments. /// Gets or sets the encoding that should be used when reading comments.
/// </summary> /// </summary>
public Encoding TextEncoding { get; set; } public Encoding TextEncoding { get; set; } = DefaultEncoding;
/// <summary> /// <summary>
/// Converts the options to a <see cref="GifDecoderOptions"/> instance with a cast /// Converts the options to a <see cref="GifDecoderOptions"/> instance with a cast
@ -53,10 +51,5 @@ namespace ImageSharp.Formats
return new GifDecoderOptions(options); return new GifDecoderOptions(options);
} }
private void InitializeWithDefaults()
{
this.TextEncoding = DefaultEncoding;
}
} }
} }

9
src/ImageSharp.Formats.Png/PngDecoderOptions.cs

@ -19,7 +19,6 @@ namespace ImageSharp.Formats
/// </summary> /// </summary>
public PngDecoderOptions() public PngDecoderOptions()
{ {
this.InitializeWithDefaults();
} }
/// <summary> /// <summary>
@ -29,13 +28,12 @@ namespace ImageSharp.Formats
private PngDecoderOptions(IDecoderOptions options) private PngDecoderOptions(IDecoderOptions options)
: base(options) : base(options)
{ {
this.InitializeWithDefaults();
} }
/// <summary> /// <summary>
/// Gets or sets the encoding that should be used when reading text chunks. /// Gets or sets the encoding that should be used when reading text chunks.
/// </summary> /// </summary>
public Encoding TextEncoding { get; set; } public Encoding TextEncoding { get; set; } = DefaultEncoding;
/// <summary> /// <summary>
/// Converts the options to a <see cref="IPngDecoderOptions"/> instance with a cast /// Converts the options to a <see cref="IPngDecoderOptions"/> instance with a cast
@ -53,10 +51,5 @@ namespace ImageSharp.Formats
return new PngDecoderOptions(options); return new PngDecoderOptions(options);
} }
private void InitializeWithDefaults()
{
this.TextEncoding = DefaultEncoding;
}
} }
} }

15
src/ImageSharp/Formats/DecoderOptions.cs

@ -15,7 +15,6 @@ namespace ImageSharp
/// </summary> /// </summary>
public DecoderOptions() public DecoderOptions()
{ {
this.InitializeWithDefaults();
} }
/// <summary> /// <summary>
@ -24,23 +23,15 @@ namespace ImageSharp
/// <param name="options">The decoder options</param> /// <param name="options">The decoder options</param>
protected DecoderOptions(IDecoderOptions options) protected DecoderOptions(IDecoderOptions options)
{ {
if (options == null) if (options != null)
{ {
this.InitializeWithDefaults(); this.IgnoreMetadata = options.IgnoreMetadata;
return;
} }
this.IgnoreMetadata = options.IgnoreMetadata;
} }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded. /// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded.
/// </summary> /// </summary>
public bool IgnoreMetadata { get; set; } public bool IgnoreMetadata { get; set; } = false;
private void InitializeWithDefaults()
{
this.IgnoreMetadata = false;
}
} }
} }

15
src/ImageSharp/Formats/EncoderOptions.cs

@ -15,7 +15,6 @@ namespace ImageSharp
/// </summary> /// </summary>
public EncoderOptions() public EncoderOptions()
{ {
this.InitializeWithDefaults();
} }
/// <summary> /// <summary>
@ -24,23 +23,15 @@ namespace ImageSharp
/// <param name="options">The encoder options</param> /// <param name="options">The encoder options</param>
protected EncoderOptions(IEncoderOptions options) protected EncoderOptions(IEncoderOptions options)
{ {
if (options == null) if (options != null)
{ {
this.InitializeWithDefaults(); this.IgnoreMetadata = options.IgnoreMetadata;
return;
} }
this.IgnoreMetadata = options.IgnoreMetadata;
} }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the metadata should be ignored when the image is being encoded. /// Gets or sets a value indicating whether the metadata should be ignored when the image is being encoded.
/// </summary> /// </summary>
public bool IgnoreMetadata { get; set; } public bool IgnoreMetadata { get; set; } = false;
private void InitializeWithDefaults()
{
this.IgnoreMetadata = false;
}
} }
} }

Loading…
Cancel
Save