Skip to content

Commit

Permalink
Merge pull request #1028 from SixLabors/js/expose-pixel-blenders
Browse files Browse the repository at this point in the history
Expose pixelblenders. #967
  • Loading branch information
JimBobSquarePants authored Oct 23, 2019
2 parents e484a40 + e6d7af0 commit 2925668
Show file tree
Hide file tree
Showing 9 changed files with 2,441 additions and 273 deletions.
6 changes: 3 additions & 3 deletions src/ImageSharp/Color/Color.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private Color(byte r, byte g, byte b)
[MethodImpl(InliningOptions.ShortMethod)]
public static Color FromHex(string hex)
{
Rgba32 rgba = Rgba32.FromHex(hex);
var rgba = Rgba32.FromHex(hex);

return new Color(rgba);
}
Expand Down Expand Up @@ -178,7 +178,7 @@ internal static void ToPixel<TPixel>(
where TPixel : struct, IPixel<TPixel>
{
ReadOnlySpan<Rgba64> rgba64Span = MemoryMarshal.Cast<Color, Rgba64>(source);
PixelOperations<TPixel>.Instance.FromRgba64(Configuration.Default, rgba64Span, destination);
PixelOperations<TPixel>.Instance.FromRgba64(configuration, rgba64Span, destination);
}
}
}
}
6 changes: 3 additions & 3 deletions src/ImageSharp/PixelFormats/PixelAlphaCompositionMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ namespace SixLabors.ImageSharp.PixelFormats
public enum PixelAlphaCompositionMode
{
/// <summary>
/// returns the destination over the source.
/// Returns the destination over the source.
/// </summary>
SrcOver = 0,

/// <summary>
/// returns the source colors.
/// Returns the source colors.
/// </summary>
Src,

/// <summary>
/// returns the source over the destination.
/// Returns the source over the destination.
/// </summary>
SrcAtop,

Expand Down
Loading

0 comments on commit 2925668

Please sign in to comment.