Browse Source

Prefer type names on left side

pull/627/head
Jason Nelson 8 years ago
parent
commit
607c871c19
  1. 4
      src/ImageSharp/Common/Helpers/ImageMaths.cs
  2. 4
      src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
  3. 2
      src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs
  4. 6
      src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs
  5. 6
      src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs
  6. 2
      src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs
  7. 2
      src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs
  8. 2
      src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
  9. 15
      src/ImageSharp/Formats/Png/PngDecoderCore.cs
  10. 2
      src/ImageSharp/PixelFormats/Bgr24.cs
  11. 42
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
  12. 2
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
  13. 2
      src/ImageSharp/PixelFormats/Rgb24.cs
  14. 2
      src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs
  15. 2
      src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs
  16. 2
      src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs
  17. 2
      src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs
  18. 2
      src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs
  19. 2
      src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs
  20. 4
      src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs
  21. 8
      src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
  22. 4
      src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs

4
src/ImageSharp/Common/Helpers/ImageMaths.cs

@ -153,8 +153,8 @@ namespace SixLabors.ImageSharp
{ {
int width = bitmap.Width; int width = bitmap.Width;
int height = bitmap.Height; int height = bitmap.Height;
var topLeft = default(Point); Point topLeft = default;
var bottomRight = default(Point); Point bottomRight = default;
Func<ImageFrame<TPixel>, int, int, float, bool> delegateFunc; Func<ImageFrame<TPixel>, int, int, float, bool> delegateFunc;

4
src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs

@ -217,7 +217,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
private void ReadRle8<TPixel>(Buffer2D<TPixel> pixels, byte[] colors, int width, int height, bool inverted) private void ReadRle8<TPixel>(Buffer2D<TPixel> pixels, byte[] colors, int width, int height, bool inverted)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
var color = default(TPixel); TPixel color = default;
var rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
using (Buffer2D<byte> buffer = this.memoryAllocator.AllocateClean2D<byte>(width, height)) using (Buffer2D<byte> buffer = this.memoryAllocator.AllocateClean2D<byte>(width, height))
@ -397,7 +397,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
{ {
int padding = CalculatePadding(width, 2); int padding = CalculatePadding(width, 2);
int stride = (width * 2) + padding; int stride = (width * 2) + padding;
var color = default(TPixel); TPixel color = default;
var rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(stride)) using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(stride))

2
src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs

@ -184,7 +184,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
/// </summary> /// </summary>
public Block8x8F AsFloatBlock() public Block8x8F AsFloatBlock()
{ {
var result = default(Block8x8F); Block8x8F result = default;
result.LoadFrom(ref this); result.LoadFrom(ref this);
return result; return result;
} }

6
src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs

@ -134,14 +134,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
public static Block8x8F Load(Span<float> data) public static Block8x8F Load(Span<float> data)
{ {
var result = default(Block8x8F); Block8x8F result = default;
result.LoadFrom(data); result.LoadFrom(data);
return result; return result;
} }
public static Block8x8F Load(Span<int> data) public static Block8x8F Load(Span<int> data)
{ {
var result = default(Block8x8F); Block8x8F result = default;
result.LoadFrom(data); result.LoadFrom(data);
return result; return result;
} }
@ -461,7 +461,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
public Block8x8 RoundAsInt16Block() public Block8x8 RoundAsInt16Block()
{ {
var result = default(Block8x8); Block8x8 result = default;
this.RoundInto(ref result); this.RoundInto(ref result);
return result; return result;
} }

6
src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs

@ -62,9 +62,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
// Walking 8 elements at one step: // Walking 8 elements at one step:
int n = result.Length / 8; int n = result.Length / 8;
var rr = default(Vector4Pair); Vector4Pair rr = default;
var gg = default(Vector4Pair); Vector4Pair gg = default;
var bb = default(Vector4Pair); Vector4Pair bb = default;
ref Vector<float> rrRefAsVector = ref Unsafe.As<Vector4Pair, Vector<float>>(ref rr); ref Vector<float> rrRefAsVector = ref Unsafe.As<Vector4Pair, Vector<float>>(ref rr);
ref Vector<float> ggRefAsVector = ref Unsafe.As<Vector4Pair, Vector<float>>(ref gg); ref Vector<float> ggRefAsVector = ref Unsafe.As<Vector4Pair, Vector<float>>(ref gg);

2
src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs

@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
/// <returns>The <see cref="ComputationData"/></returns> /// <returns>The <see cref="ComputationData"/></returns>
public static ComputationData Create() public static ComputationData Create()
{ {
var data = default(ComputationData); ComputationData data = default;
data.Unzig = ZigZag.CreateUnzigTable(); data.Unzig = ZigZag.CreateUnzigTable();
return data; return data;
} }

2
src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs

@ -773,7 +773,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
/// </exception> /// </exception>
private void ProcessStartOfScanMarker(int remaining) private void ProcessStartOfScanMarker(int remaining)
{ {
var scan = default(GolangJpegScanDecoder); GolangJpegScanDecoder scan = default;
GolangJpegScanDecoder.InitStreamReading(&scan, this, remaining); GolangJpegScanDecoder.InitStreamReading(&scan, this, remaining);
this.InputProcessor.Bits = default; this.InputProcessor.Bits = default;
scan.DecodeBlocks(this); scan.DecodeBlocks(this);

2
src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs

@ -786,7 +786,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
int spectralStart = this.temp[0]; int spectralStart = this.temp[0];
int spectralEnd = this.temp[1]; int spectralEnd = this.temp[1];
int successiveApproximation = this.temp[2]; int successiveApproximation = this.temp[2];
var scanDecoder = default(PdfJsScanDecoder); PdfJsScanDecoder scanDecoder = default;
scanDecoder.DecodeScan( scanDecoder.DecodeScan(
this.Frame, this.Frame,

15
src/ImageSharp/Formats/Png/PngDecoderCore.cs

@ -670,7 +670,7 @@ namespace SixLabors.ImageSharp.Formats.Png
private void ProcessDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, ImageFrame<TPixel> pixels) private void ProcessDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, ImageFrame<TPixel> pixels)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
var color = default(TPixel); TPixel color = default;
Span<TPixel> rowSpan = pixels.GetPixelRowSpan(this.currentRow); Span<TPixel> rowSpan = pixels.GetPixelRowSpan(this.currentRow);
// Trim the first marker byte from the buffer // Trim the first marker byte from the buffer
@ -753,7 +753,7 @@ namespace SixLabors.ImageSharp.Formats.Png
for (int x = 0; x < this.header.Width; x++) for (int x = 0; x < this.header.Width; x++)
{ {
ref Rgb24 rgb24 = ref rgb24Span[x]; ref Rgb24 rgb24 = ref rgb24Span[x];
var rgba32 = default(Rgba32); Rgba32 rgba32 = default;
rgba32.Rgb = rgb24; rgba32.Rgb = rgb24;
rgba32.A = (byte)(rgb24.Equals(this.rgb24Trans) ? 0 : 255); rgba32.A = (byte)(rgb24.Equals(this.rgb24Trans) ? 0 : 255);
@ -768,7 +768,7 @@ namespace SixLabors.ImageSharp.Formats.Png
for (int x = 0; x < this.header.Width; x++) for (int x = 0; x < this.header.Width; x++)
{ {
ref readonly Rgb24 rgb24 = ref rgb24Span[x]; ref readonly Rgb24 rgb24 = ref rgb24Span[x];
var rgba32 = default(Rgba32); Rgba32 rgba32 = default;
rgba32.Rgb = rgb24; rgba32.Rgb = rgb24;
rgba32.A = (byte)(rgb24.Equals(this.rgb24Trans) ? 0 : 255); rgba32.A = (byte)(rgb24.Equals(this.rgb24Trans) ? 0 : 255);
@ -854,9 +854,8 @@ namespace SixLabors.ImageSharp.Formats.Png
{ {
ReadOnlySpan<byte> newScanline = ToArrayByBitsLength(defilteredScanline, this.bytesPerScanline, this.header.BitDepth); ReadOnlySpan<byte> newScanline = ToArrayByBitsLength(defilteredScanline, this.bytesPerScanline, this.header.BitDepth);
ReadOnlySpan<Rgb24> pal = MemoryMarshal.Cast<byte, Rgb24>(this.palette); ReadOnlySpan<Rgb24> pal = MemoryMarshal.Cast<byte, Rgb24>(this.palette);
var color = default(TPixel); TPixel color = default;
Rgba32 rgba = default;
var rgba = default(Rgba32);
if (this.paletteAlpha != null && this.paletteAlpha.Length > 0) if (this.paletteAlpha != null && this.paletteAlpha.Length > 0)
{ {
@ -900,7 +899,7 @@ namespace SixLabors.ImageSharp.Formats.Png
private void ProcessInterlacedDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, Span<TPixel> rowSpan, int pixelOffset = 0, int increment = 1) private void ProcessInterlacedDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, Span<TPixel> rowSpan, int pixelOffset = 0, int increment = 1)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
var color = default(TPixel); TPixel color = default;
// Trim the first marker byte from the buffer // Trim the first marker byte from the buffer
ReadOnlySpan<byte> scanlineBuffer = defilteredScanline.Slice(1, defilteredScanline.Length - 1); ReadOnlySpan<byte> scanlineBuffer = defilteredScanline.Slice(1, defilteredScanline.Length - 1);
@ -943,7 +942,7 @@ namespace SixLabors.ImageSharp.Formats.Png
case PngColorType.Palette: case PngColorType.Palette:
ReadOnlySpan<byte> newScanline = ToArrayByBitsLength(scanlineBuffer, this.bytesPerScanline, this.header.BitDepth); ReadOnlySpan<byte> newScanline = ToArrayByBitsLength(scanlineBuffer, this.bytesPerScanline, this.header.BitDepth);
var rgba = default(Rgba32); Rgba32 rgba = default;
Span<Rgb24> pal = MemoryMarshal.Cast<byte, Rgb24>(this.palette); Span<Rgb24> pal = MemoryMarshal.Cast<byte, Rgb24>(this.palette);
if (this.paletteAlpha != null && this.paletteAlpha.Length > 0) if (this.paletteAlpha != null && this.paletteAlpha.Length > 0)

2
src/ImageSharp/PixelFormats/Bgr24.cs

@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.PixelFormats
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void PackFromVector4(Vector4 vector) public void PackFromVector4(Vector4 vector)
{ {
var rgba = default(Rgba32); Rgba32 rgba = default;
rgba.PackFromVector4(vector); rgba.PackFromVector4(vector);
this.PackFromRgba32(rgba); this.PackFromRgba32(rgba);
} }

42
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs

@ -261,7 +261,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Normal<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Normal<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Normal(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Normal(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -270,7 +270,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Multiply<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Multiply<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Multiply(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Multiply(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -279,7 +279,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Add<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Add<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Add(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Add(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -288,7 +288,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Subtract<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Subtract<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Subtract(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Subtract(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -297,7 +297,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Screen<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Screen<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Screen(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Screen(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -306,7 +306,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Darken<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Darken<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Darken(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Darken(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -315,7 +315,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Lighten<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Lighten<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Lighten(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Lighten(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -324,7 +324,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Overlay<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Overlay<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Overlay(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Overlay(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -333,7 +333,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel HardLight<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel HardLight<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(HardLight(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(HardLight(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -342,7 +342,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Src<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Src<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Src(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Src(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -351,7 +351,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Atop<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Atop<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Atop(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Atop(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -360,7 +360,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Over<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Over<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Over(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Over(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -369,7 +369,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel In<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel In<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(In(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(In(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -378,7 +378,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Out<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Out<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Out(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Out(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -387,7 +387,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Dest<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Dest<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Dest(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Dest(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -396,7 +396,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel DestAtop<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel DestAtop<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(DestAtop(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(DestAtop(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -405,7 +405,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel DestOver<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel DestOver<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(DestOver(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(DestOver(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -414,7 +414,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel DestIn<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel DestIn<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(DestIn(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(DestIn(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -423,7 +423,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel DestOut<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel DestOut<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(DestOut(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(DestOut(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -432,7 +432,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Clear<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Clear<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Clear(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Clear(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }
@ -441,7 +441,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel Xor<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Xor<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(Xor(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Xor(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }

2
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt

@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
public static TPixel <#=blender#><TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel <#=blender#><TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default;
dest.PackFromVector4(<#=blender#>(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(<#=blender#>(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }

2
src/ImageSharp/PixelFormats/Rgb24.cs

@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.PixelFormats
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void PackFromVector4(Vector4 vector) public void PackFromVector4(Vector4 vector)
{ {
var rgba = default(Rgba32); Rgba32 rgba = default;
rgba.PackFromVector4(vector); rgba.PackFromVector4(vector);
this.PackFromRgba32(rgba); this.PackFromRgba32(rgba);
} }

2
src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs

@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Processing.Binarization.Processors
protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration) protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
{ {
float threshold = this.Threshold * 255F; float threshold = this.Threshold * 255F;
var rgba = default(Rgba32); Rgba32 rgba = default;
bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8); bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
var interest = Rectangle.Intersect(sourceRectangle, source.Bounds()); var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());

2
src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs

@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Processing.Binarization.Processors
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration) protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
{ {
var rgba = default(Rgba32); Rgba32 rgba = default;
bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8); bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
var interest = Rectangle.Intersect(sourceRectangle, source.Bounds()); var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());

2
src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs

@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.Processing.Binarization.Processors
y => y =>
{ {
Span<TPixel> row = source.GetPixelRowSpan(y); Span<TPixel> row = source.GetPixelRowSpan(y);
var rgba = default(Rgba32); Rgba32 rgba = default;
for (int x = startX; x < endX; x++) for (int x = startX; x < endX; x++)
{ {

2
src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs

@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Processing.Convolution.Processors
for (int x = startX; x < endX; x++) for (int x = startX; x < endX; x++)
{ {
var destination = default(Vector4); Vector4 destination = default;
// Apply each matrix multiplier to the color components for each pixel. // Apply each matrix multiplier to the color components for each pixel.
for (int fy = 0; fy < kernelHeight; fy++) for (int fy = 0; fy < kernelHeight; fy++)

2
src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs

@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering.Processors
protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration) protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
{ {
float threshold = this.Threshold * 255F; float threshold = this.Threshold * 255F;
var rgba = default(Rgba32); Rgba32 rgba = default;
bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8); bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
var interest = Rectangle.Intersect(sourceRectangle, source.Bounds()); var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());

2
src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs

@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering.Processors
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration) protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
{ {
var rgba = default(Rgba32); Rgba32 rgba = default;
bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8); bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
var interest = Rectangle.Intersect(sourceRectangle, source.Bounds()); var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());

4
src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs

@ -46,8 +46,8 @@ namespace SixLabors.ImageSharp.Processing.Dithering.Processors
float secondLeastDistance = int.MaxValue; float secondLeastDistance = int.MaxValue;
var vector = pixel.ToVector4(); var vector = pixel.ToVector4();
var closest = default(TPixel); TPixel closest = default;
var secondClosest = default(TPixel); TPixel secondClosest = default;
for (int index = 0; index < colorPalette.Length; index++) for (int index = 0; index < colorPalette.Length; index++)
{ {
TPixel temp = colorPalette[index]; TPixel temp = colorPalette[index];

8
src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs

@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
ref TPixel scanBaseRef = ref MemoryMarshal.GetReference(row); ref TPixel scanBaseRef = ref MemoryMarshal.GetReference(row);
// And loop through each column // And loop through each column
var rgba = default(Rgba32); Rgba32 rgba = default;
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
ref TPixel pixel = ref Unsafe.Add(ref scanBaseRef, x); ref TPixel pixel = ref Unsafe.Add(ref scanBaseRef, x);
@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
// pass of the algorithm by avoiding transforming rows of identical color. // pass of the algorithm by avoiding transforming rows of identical color.
TPixel sourcePixel = source[0, 0]; TPixel sourcePixel = source[0, 0];
TPixel previousPixel = sourcePixel; TPixel previousPixel = sourcePixel;
var rgba = default(Rgba32); Rgba32 rgba = default;
byte pixelValue = this.QuantizePixel(sourcePixel, ref rgba); byte pixelValue = this.QuantizePixel(sourcePixel, ref rgba);
TPixel[] colorPalette = this.GetPalette(); TPixel[] colorPalette = this.GetPalette();
TPixel transformedPixel = colorPalette[pixelValue]; TPixel transformedPixel = colorPalette[pixelValue];
@ -152,7 +152,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
{ {
// Transparent pixels are much more likely to be found at the end of a palette // Transparent pixels are much more likely to be found at the end of a palette
int index = this.colors; int index = this.colors;
var trans = default(Rgba32); Rgba32 trans = default;
for (int i = this.palette.Length - 1; i >= 0; i--) for (int i = this.palette.Length - 1; i >= 0; i--)
{ {
this.palette[i].ToRgba32(ref trans); this.palette[i].ToRgba32(ref trans);
@ -539,7 +539,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
byte b = (this.blue / this.pixelCount).ToByte(); byte b = (this.blue / this.pixelCount).ToByte();
// And set the color of the palette entry // And set the color of the palette entry
var pixel = default(TPixel); TPixel pixel = default;
pixel.PackFromRgba32(new Rgba32(r, g, b, 255)); pixel.PackFromRgba32(new Rgba32(r, g, b, 255));
palette[index] = pixel; palette[index] = pixel;

4
src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs

@ -237,7 +237,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
ref TPixel scanBaseRef = ref MemoryMarshal.GetReference(row); ref TPixel scanBaseRef = ref MemoryMarshal.GetReference(row);
// And loop through each column // And loop through each column
var rgba = default(Rgba32); Rgba32 rgba = default;
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
ref TPixel pixel = ref Unsafe.Add(ref scanBaseRef, x); ref TPixel pixel = ref Unsafe.Add(ref scanBaseRef, x);
@ -858,7 +858,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
} }
// Expected order r->g->b->a // Expected order r->g->b->a
var rgba = default(Rgba32); Rgba32 rgba = default;
pixel.ToRgba32(ref rgba); pixel.ToRgba32(ref rgba);
int r = rgba.R >> (8 - IndexBits); int r = rgba.R >> (8 - IndexBits);

Loading…
Cancel
Save