Browse Source

Rename PngTransparentColorBehavior to PngTransparentColorMode

pull/1012/head
Brian Popow 6 years ago
parent
commit
b69d772659
  1. 2
      src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
  2. 2
      src/ImageSharp/Formats/Png/PngEncoder.cs
  3. 4
      src/ImageSharp/Formats/Png/PngEncoderCore.cs
  4. 4
      src/ImageSharp/Formats/Png/PngEncoderOptions.cs
  5. 2
      src/ImageSharp/Formats/Png/PngTransparentColorMode.cs
  6. 2
      tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

2
src/ImageSharp/Formats/Png/IPngEncoderOptions.cs

@ -73,6 +73,6 @@ namespace SixLabors.ImageSharp.Formats.Png
/// Gets a value indicating whether fully transparent pixels that may contain R, G, B values which are not 0, /// Gets a value indicating whether fully transparent pixels that may contain R, G, B values which are not 0,
/// should be converted to transparent black, which can yield in better compression in some cases. /// should be converted to transparent black, which can yield in better compression in some cases.
/// </summary> /// </summary>
PngTransparentColorBehavior TransparentColorBehavior { get; } PngTransparentColorMode TransparentColorMode { get; }
} }
} }

2
src/ImageSharp/Formats/Png/PngEncoder.cs

@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Formats.Png
public bool IgnoreMetadata { get; set; } public bool IgnoreMetadata { get; set; }
/// <inheritdoc/> /// <inheritdoc/>
public PngTransparentColorBehavior TransparentColorBehavior { get; set; } public PngTransparentColorMode TransparentColorMode { get; set; }
/// <summary> /// <summary>
/// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>. /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.

4
src/ImageSharp/Formats/Png/PngEncoderCore.cs

@ -145,7 +145,7 @@ namespace SixLabors.ImageSharp.Formats.Png
PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance); PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance);
PngEncoderOptionsHelpers.AdjustOptions<TPixel>(this.options, pngMetadata, out this.use16Bit, out this.bytesPerPixel); PngEncoderOptionsHelpers.AdjustOptions<TPixel>(this.options, pngMetadata, out this.use16Bit, out this.bytesPerPixel);
Image<TPixel> clonedImage = null; Image<TPixel> clonedImage = null;
bool clearTransparency = this.options.TransparentColorBehavior == PngTransparentColorBehavior.Clear; bool clearTransparency = this.options.TransparentColorMode == PngTransparentColorMode.Clear;
if (clearTransparency) if (clearTransparency)
{ {
clonedImage = image.Clone(); clonedImage = image.Clone();
@ -225,7 +225,7 @@ namespace SixLabors.ImageSharp.Formats.Png
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
IndexedImageFrame<TPixel> quantized; IndexedImageFrame<TPixel> quantized;
if (this.options.TransparentColorBehavior == PngTransparentColorBehavior.Clear) if (this.options.TransparentColorMode == PngTransparentColorMode.Clear)
{ {
quantized = PngEncoderOptionsHelpers.CreateQuantizedFrame(this.options, clonedImage); quantized = PngEncoderOptionsHelpers.CreateQuantizedFrame(this.options, clonedImage);
this.bitDepth = PngEncoderOptionsHelpers.CalculateBitDepth(this.options, quantized); this.bitDepth = PngEncoderOptionsHelpers.CalculateBitDepth(this.options, quantized);

4
src/ImageSharp/Formats/Png/PngEncoderOptions.cs

@ -31,7 +31,7 @@ namespace SixLabors.ImageSharp.Formats.Png
this.InterlaceMethod = source.InterlaceMethod; this.InterlaceMethod = source.InterlaceMethod;
this.ChunkFilter = source.ChunkFilter; this.ChunkFilter = source.ChunkFilter;
this.IgnoreMetadata = source.IgnoreMetadata; this.IgnoreMetadata = source.IgnoreMetadata;
this.TransparentColorBehavior = source.TransparentColorBehavior; this.TransparentColorMode = source.TransparentColorMode;
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -68,6 +68,6 @@ namespace SixLabors.ImageSharp.Formats.Png
public bool IgnoreMetadata { get; set; } public bool IgnoreMetadata { get; set; }
/// <inheritdoc/> /// <inheritdoc/>
public PngTransparentColorBehavior TransparentColorBehavior { get; set; } public PngTransparentColorMode TransparentColorMode { get; set; }
} }
} }

2
src/ImageSharp/Formats/Png/PngTransparentColorBehavior.cs → src/ImageSharp/Formats/Png/PngTransparentColorMode.cs

@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Formats.Png
/// <summary> /// <summary>
/// Enum indicating how the transparency should be handled on encoding. /// Enum indicating how the transparency should be handled on encoding.
/// </summary> /// </summary>
public enum PngTransparentColorBehavior public enum PngTransparentColorMode
{ {
/// <summary> /// <summary>
/// The transparency will be kept as is. /// The transparency will be kept as is.

2
tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@ -400,7 +400,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
var image = new Image<Rgba32>(50, 50); var image = new Image<Rgba32>(50, 50);
var encoder = new PngEncoder() var encoder = new PngEncoder()
{ {
TransparentColorBehavior = PngTransparentColorBehavior.Clear, TransparentColorMode = PngTransparentColorMode.Clear,
ColorType = colorType ColorType = colorType
}; };
Rgba32 rgba32 = Color.Blue; Rgba32 rgba32 = Color.Blue;

Loading…
Cancel
Save