Browse Source

Minor cleanup

pull/540/head
James Jackson-South 8 years ago
parent
commit
15742cf2e6
  1. 18
      src/ImageSharp/PixelFormats/Generated/PixelOperations{TPixel}.Generated.cs
  2. 6
      src/ImageSharp/PixelFormats/Generated/PixelOperations{TPixel}.Generated.tt
  3. 5
      src/ImageSharp/PixelFormats/Rgba32.cs

18
src/ImageSharp/PixelFormats/Generated/PixelOperations{TPixel}.Generated.cs

@ -24,13 +24,13 @@ namespace SixLabors.ImageSharp.PixelFormats
ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(source); ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Rgba32 rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
ref TPixel dp = ref Unsafe.Add(ref destRef, i); ref TPixel dp = ref Unsafe.Add(ref destRef, i);
rgba = Unsafe.Add(ref sourceRef, i); rgba = Unsafe.Add(ref sourceRef, i);
dp.PackFromRgba32(rgba); dp.PackFromRgba32(rgba);
} }
} }
@ -95,13 +95,13 @@ namespace SixLabors.ImageSharp.PixelFormats
ref Bgra32 sourceRef = ref MemoryMarshal.GetReference(source); ref Bgra32 sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Rgba32 rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
ref TPixel dp = ref Unsafe.Add(ref destRef, i); ref TPixel dp = ref Unsafe.Add(ref destRef, i);
rgba = Unsafe.Add(ref sourceRef, i).ToRgba32(); rgba = Unsafe.Add(ref sourceRef, i).ToRgba32();
dp.PackFromRgba32(rgba); dp.PackFromRgba32(rgba);
} }
} }
@ -166,13 +166,13 @@ namespace SixLabors.ImageSharp.PixelFormats
ref Rgb24 sourceRef = ref MemoryMarshal.GetReference(source); ref Rgb24 sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Rgba32 rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
ref TPixel dp = ref Unsafe.Add(ref destRef, i); ref TPixel dp = ref Unsafe.Add(ref destRef, i);
rgba.Rgb = Unsafe.Add(ref sourceRef, i); rgba.Rgb = Unsafe.Add(ref sourceRef, i);
dp.PackFromRgba32(rgba); dp.PackFromRgba32(rgba);
} }
} }
@ -237,13 +237,13 @@ namespace SixLabors.ImageSharp.PixelFormats
ref Bgr24 sourceRef = ref MemoryMarshal.GetReference(source); ref Bgr24 sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Rgba32 rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
ref TPixel dp = ref Unsafe.Add(ref destRef, i); ref TPixel dp = ref Unsafe.Add(ref destRef, i);
rgba.Bgr = Unsafe.Add(ref sourceRef, i); rgba.Bgr = Unsafe.Add(ref sourceRef, i);
dp.PackFromRgba32(rgba); dp.PackFromRgba32(rgba);
} }
} }
@ -308,7 +308,7 @@ namespace SixLabors.ImageSharp.PixelFormats
ref Argb32 sourceRef = ref MemoryMarshal.GetReference(source); ref Argb32 sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Argb32 argb = new Argb32(0, 0, 0, 255); var argb = new Argb32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {

6
src/ImageSharp/PixelFormats/Generated/PixelOperations{TPixel}.Generated.tt

@ -68,13 +68,13 @@
ref <#=pixelType#> sourceRef = ref MemoryMarshal.GetReference(source); ref <#=pixelType#> sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Rgba32 rgba = new Rgba32(0, 0, 0, 255); var rgba = new Rgba32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
ref TPixel dp = ref Unsafe.Add(ref destRef, i); ref TPixel dp = ref Unsafe.Add(ref destRef, i);
<#=rgbaOperationCode#> <#=rgbaOperationCode#>
dp.PackFromRgba32(rgba); dp.PackFromRgba32(rgba);
} }
} }
@ -110,7 +110,7 @@
ref <#=pixelType#> sourceRef = ref MemoryMarshal.GetReference(source); ref <#=pixelType#> sourceRef = ref MemoryMarshal.GetReference(source);
ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels); ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
Argb32 argb = new Argb32(0, 0, 0, 255); var argb = new Argb32(0, 0, 0, 255);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {

5
src/ImageSharp/PixelFormats/Rgba32.cs

@ -279,7 +279,10 @@ namespace SixLabors.ImageSharp.PixelFormats
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void PackFromArgb32(Argb32 source) public void PackFromArgb32(Argb32 source)
{ {
Pack(source.R, source.G, source.B, source.A); this.R = source.R;
this.G = source.G;
this.B = source.B;
this.A = source.A;
} }
/// <summary> /// <summary>

Loading…
Cancel
Save