Skip to content

Add new PixelAlphaRepresentation property and implement for TPixel types #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimBobSquarePants merged 11 commits into from
Nov 20, 2020
Merged

Add new PixelAlphaRepresentation property and implement for TPixel types #1420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
686aef7
Add new property and implement for TPixel types
JimBobSquarePants Nov 8, 2020
181d434
Update External
JimBobSquarePants Nov 8, 2020
842cd37
Fix Short4 and tests
JimBobSquarePants Nov 8, 2020
f30e22f
Remove bas T4 refs
JimBobSquarePants Nov 11, 2020
e18ef9f
Don't autogenerate GetPixelTypeInfo
JimBobSquarePants Nov 11, 2020
ed949f6
Merge branch 'master' into js/pixel-type-info
JimBobSquarePants Nov 15, 2020
dae53a3
Merge branch 'master' into js/pixel-type-info
antonfirsov Nov 16, 2020
589bd68
Merge branch 'master' into js/pixel-type-info
JimBobSquarePants Nov 16, 2020
a0a6aea
Update tests
JimBobSquarePants Nov 18, 2020
f23fd09
Make PixelTypeInfo lazy
JimBobSquarePants Nov 18, 2020
8a065ac
Move property to base.
JimBobSquarePants Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't autogenerate GetPixelTypeInfo
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Nov 11, 2020
commit e18ef9f7e30c419aada4e464308e0c64794f6b66
22 changes: 22 additions & 0 deletions src/ImageSharp/PixelFormats/PixelImplementations/PixelOperations/Argb32.PixelOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.

using SixLabors.ImageSharp.Formats;

namespace SixLabors.ImageSharp.PixelFormats
{
/// <content>
/// Provides optimized overrides for bulk operations.
/// </content>
public partial struct Argb32
{
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal partial class PixelOperations : PixelOperations<Argb32>
{
/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<Argb32>(PixelAlphaRepresentation.Unassociated);
}
}
}
23 changes: 23 additions & 0 deletions src/ImageSharp/PixelFormats/PixelImplementations/PixelOperations/Bgr24.PixelOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.

using SixLabors.ImageSharp.Formats;

namespace SixLabors.ImageSharp.PixelFormats
{
/// <content>
/// Provides optimized overrides for bulk operations.
/// </content>
public partial struct Bgr24
{
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal partial class PixelOperations : PixelOperations<Bgr24>
{
/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo()
=> PixelTypeInfo.Create<Bgr24>(PixelAlphaRepresentation.None);
}
}
}
23 changes: 23 additions & 0 deletions src/ImageSharp/PixelFormats/PixelImplementations/PixelOperations/Bgra32.PixelOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.

using SixLabors.ImageSharp.Formats;

namespace SixLabors.ImageSharp.PixelFormats
{
/// <content>
/// Provides optimized overrides for bulk operations.
/// </content>
public partial struct Bgra32
{
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal partial class PixelOperations : PixelOperations<Bgra32>
{
/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo()
=> PixelTypeInfo.Create<Bgra32>(PixelAlphaRepresentation.Unassociated);
}
}
}
23 changes: 23 additions & 0 deletions src/ImageSharp/PixelFormats/PixelImplementations/PixelOperations/Bgra5551.PixelOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.

using SixLabors.ImageSharp.Formats;

namespace SixLabors.ImageSharp.PixelFormats
{
/// <content>
/// Provides optimized overrides for bulk operations.
/// </content>
public partial struct Bgra5551
{
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal partial class PixelOperations : PixelOperations<Bgra5551>
{
/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo()
=> PixelTypeInfo.Create<Bgra5551>(PixelAlphaRepresentation.Unassociated);
}
}
}
6 changes: 1 addition & 5 deletions ...ormats/PixelImplementations/PixelOperations/Generated/Argb32.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct Argb32
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Argb32>
internal partial class PixelOperations : PixelOperations<Argb32>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<Argb32>(PixelAlphaRepresentation.Unassociated);

/// <inheritdoc />
public override void FromArgb32(Configuration configuration, ReadOnlySpan<Argb32> source, Span<Argb32> destinationPixels)
{
Expand Down
3 changes: 1 addition & 2 deletions ...ormats/PixelImplementations/PixelOperations/Generated/Argb32.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Argb32>
internal partial class PixelOperations : PixelOperations<Argb32>
{
<# GeneratePixelTypeInfo("Argb32"); #>
<# GenerateAllDefaultConversionMethods("Argb32"); #>
}
}
Expand Down
6 changes: 1 addition & 5 deletions ...Formats/PixelImplementations/PixelOperations/Generated/Bgr24.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct Bgr24
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Bgr24>
internal partial class PixelOperations : PixelOperations<Bgr24>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<Bgr24>(PixelAlphaRepresentation.None);

/// <inheritdoc />
public override void FromBgr24(Configuration configuration, ReadOnlySpan<Bgr24> source, Span<Bgr24> destinationPixels)
{
Expand Down
3 changes: 1 addition & 2 deletions ...Formats/PixelImplementations/PixelOperations/Generated/Bgr24.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Bgr24>
internal partial class PixelOperations : PixelOperations<Bgr24>
{
<# GeneratePixelTypeInfo("Bgr24"); #>
<# GenerateAllDefaultConversionMethods("Bgr24"); #>
}
}
Expand Down
6 changes: 1 addition & 5 deletions ...ormats/PixelImplementations/PixelOperations/Generated/Bgra32.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct Bgra32
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Bgra32>
internal partial class PixelOperations : PixelOperations<Bgra32>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<Bgra32>(PixelAlphaRepresentation.Unassociated);

/// <inheritdoc />
public override void FromBgra32(Configuration configuration, ReadOnlySpan<Bgra32> source, Span<Bgra32> destinationPixels)
{
Expand Down
3 changes: 1 addition & 2 deletions ...ormats/PixelImplementations/PixelOperations/Generated/Bgra32.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Bgra32>
internal partial class PixelOperations : PixelOperations<Bgra32>
{
<# GeneratePixelTypeInfo("Bgra32"); #>
<# GenerateAllDefaultConversionMethods("Bgra32"); #>
}
}
Expand Down
7 changes: 1 addition & 6 deletions ...mats/PixelImplementations/PixelOperations/Generated/Bgra5551.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct Bgra5551
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Bgra5551>
internal partial class PixelOperations : PixelOperations<Bgra5551>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<Bgra5551>(PixelAlphaRepresentation.Unassociated);

/// <inheritdoc />
public override void FromBgra5551(Configuration configuration, ReadOnlySpan<Bgra5551> source, Span<Bgra5551> destinationPixels)
{
Expand All @@ -44,7 +40,6 @@ public override void ToBgra5551(Configuration configuration, ReadOnlySpan<Bgra55
sourcePixels.CopyTo(destinationPixels);
}


/// <inheritdoc />
public override void ToArgb32(
Configuration configuration,
Expand Down
3 changes: 1 addition & 2 deletions ...mats/PixelImplementations/PixelOperations/Generated/Bgra5551.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<Bgra5551>
internal partial class PixelOperations : PixelOperations<Bgra5551>
{
<# GeneratePixelTypeInfo("Bgra5551"); #>
<# GenerateAllDefaultConversionMethods("Bgra5551"); #>
}
}
Expand Down
7 changes: 1 addition & 6 deletions ...elFormats/PixelImplementations/PixelOperations/Generated/L16.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct L16
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<L16>
internal partial class PixelOperations : PixelOperations<L16>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<L16>(PixelAlphaRepresentation.None);

/// <inheritdoc />
public override void FromL16(Configuration configuration, ReadOnlySpan<L16> source, Span<L16> destinationPixels)
{
Expand All @@ -44,7 +40,6 @@ public override void ToL16(Configuration configuration, ReadOnlySpan<L16> source
sourcePixels.CopyTo(destinationPixels);
}


/// <inheritdoc />
public override void ToArgb32(
Configuration configuration,
Expand Down
3 changes: 1 addition & 2 deletions ...elFormats/PixelImplementations/PixelOperations/Generated/L16.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<L16>
internal partial class PixelOperations : PixelOperations<L16>
{
<# GeneratePixelTypeInfo("L16"); #>
<# GenerateAllDefaultConversionMethods("L16"); #>
}
}
Expand Down
7 changes: 1 addition & 6 deletions ...xelFormats/PixelImplementations/PixelOperations/Generated/L8.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct L8
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<L8>
internal partial class PixelOperations : PixelOperations<L8>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<L8>(PixelAlphaRepresentation.None);

/// <inheritdoc />
public override void FromL8(Configuration configuration, ReadOnlySpan<L8> source, Span<L8> destinationPixels)
{
Expand All @@ -44,7 +40,6 @@ public override void ToL8(Configuration configuration, ReadOnlySpan<L8> sourcePi
sourcePixels.CopyTo(destinationPixels);
}


/// <inheritdoc />
public override void ToArgb32(
Configuration configuration,
Expand Down
3 changes: 1 addition & 2 deletions ...xelFormats/PixelImplementations/PixelOperations/Generated/L8.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<L8>
internal partial class PixelOperations : PixelOperations<L8>
{
<# GeneratePixelTypeInfo("L8"); #>
<# GenerateAllDefaultConversionMethods("L8"); #>
}
}
Expand Down
7 changes: 1 addition & 6 deletions ...lFormats/PixelImplementations/PixelOperations/Generated/La16.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct La16
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<La16>
internal partial class PixelOperations : PixelOperations<La16>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<La16>(PixelAlphaRepresentation.Unassociated);

/// <inheritdoc />
public override void FromLa16(Configuration configuration, ReadOnlySpan<La16> source, Span<La16> destinationPixels)
{
Expand All @@ -44,7 +40,6 @@ public override void ToLa16(Configuration configuration, ReadOnlySpan<La16> sour
sourcePixels.CopyTo(destinationPixels);
}


/// <inheritdoc />
public override void ToArgb32(
Configuration configuration,
Expand Down
3 changes: 1 addition & 2 deletions ...lFormats/PixelImplementations/PixelOperations/Generated/La16.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<La16>
internal partial class PixelOperations : PixelOperations<La16>
{
<# GeneratePixelTypeInfo("La16"); #>
<# GenerateAllDefaultConversionMethods("La16"); #>
}
}
Expand Down
7 changes: 1 addition & 6 deletions ...lFormats/PixelImplementations/PixelOperations/Generated/La32.PixelOperations.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats.Utils;

namespace SixLabors.ImageSharp.PixelFormats
Expand All @@ -20,12 +19,9 @@ public partial struct La32
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<La32>
internal partial class PixelOperations : PixelOperations<La32>
{

/// <inheritdoc />
public override PixelTypeInfo GetPixelTypeInfo() => PixelTypeInfo.Create<La32>(PixelAlphaRepresentation.Unassociated);

/// <inheritdoc />
public override void FromLa32(Configuration configuration, ReadOnlySpan<La32> source, Span<La32> destinationPixels)
{
Expand All @@ -44,7 +40,6 @@ public override void ToLa32(Configuration configuration, ReadOnlySpan<La32> sour
sourcePixels.CopyTo(destinationPixels);
}


/// <inheritdoc />
public override void ToArgb32(
Configuration configuration,
Expand Down
3 changes: 1 addition & 2 deletions ...lFormats/PixelImplementations/PixelOperations/Generated/La32.PixelOperations.Generated.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ namespace SixLabors.ImageSharp.PixelFormats
/// <summary>
/// Provides optimized overrides for bulk operations.
/// </summary>
internal class PixelOperations : PixelOperations<La32>
internal partial class PixelOperations : PixelOperations<La32>
{
<# GeneratePixelTypeInfo("La32"); #>
<# GenerateAllDefaultConversionMethods("La32"); #>
}
}
Expand Down
Loading