tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'dl/remove-duplicate' of https://github.com/SixLabors/ImageSharp into dl/remove-duplicate

af/merge-core
Anton Firszov 8 years ago
parent
fe6953f34c bf8262ca02
commit
821118fb4f
19 changed files with 466 additions and 517 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs
  2. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.tt
  3. 3
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.cs
  4. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.tt
  5. 3
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs
  6. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.tt
  7. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray16.PixelOperations.Generated.cs
  8. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray16.PixelOperations.Generated.tt
  9. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray8.PixelOperations.Generated.cs
  10. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray8.PixelOperations.Generated.tt
  11. 3
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs
  12. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.tt
  13. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.cs
  14. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.tt
  15. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.cs
  16. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.tt
  17. 2
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.cs
  18. 5
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.tt
  19. 20
      src/ImageSharp/PixelFormats/PixelImplementations/Generated/_Common.ttinclude

3
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Argb32> internal class PixelOperations : PixelOperations<Argb32>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromArgb32(Configuration configuration, ReadOnlySpan<Argb32> source, Span<Argb32> destPixels) internal override void FromArgb32(Configuration configuration, ReadOnlySpan<Argb32> source, Span<Argb32> destPixels)
{ {
@ -42,7 +41,6 @@ namespace SixLabors.ImageSharp.PixelFormats
sourcePixels.CopyTo(destPixels); sourcePixels.CopyTo(destPixels);
} }
/// <inheritdoc /> /// <inheritdoc />
internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Argb32> destPixels) internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Argb32> destPixels)
{ {
@ -237,7 +235,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromArgb32(sp); dp.FromArgb32(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Argb32> internal class PixelOperations : PixelOperations<Argb32>
{ {
<# <# GenerateAllDefaultConversionMethods("Argb32"); #>
GenerateAllDefaultConversionMethods("Argb32");
#>
} }
} }
} }

3
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Bgr24> internal class PixelOperations : PixelOperations<Bgr24>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromBgr24(Configuration configuration, ReadOnlySpan<Bgr24> source, Span<Bgr24> destPixels) internal override void FromBgr24(Configuration configuration, ReadOnlySpan<Bgr24> source, Span<Bgr24> destPixels)
{ {
@ -42,7 +41,6 @@ namespace SixLabors.ImageSharp.PixelFormats
sourcePixels.CopyTo(destPixels); sourcePixels.CopyTo(destPixels);
} }
/// <inheritdoc /> /// <inheritdoc />
internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Bgr24> destPixels) internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Bgr24> destPixels)
{ {
@ -211,7 +209,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromBgr24(sp); dp.FromBgr24(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Bgr24> internal class PixelOperations : PixelOperations<Bgr24>
{ {
<# <# GenerateAllDefaultConversionMethods("Bgr24"); #>
GenerateAllDefaultConversionMethods("Bgr24");
#>
} }
} }
} }

3
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Bgra32> internal class PixelOperations : PixelOperations<Bgra32>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromBgra32(Configuration configuration, ReadOnlySpan<Bgra32> source, Span<Bgra32> destPixels) internal override void FromBgra32(Configuration configuration, ReadOnlySpan<Bgra32> source, Span<Bgra32> destPixels)
{ {
@ -42,7 +41,6 @@ namespace SixLabors.ImageSharp.PixelFormats
sourcePixels.CopyTo(destPixels); sourcePixels.CopyTo(destPixels);
} }
/// <inheritdoc /> /// <inheritdoc />
internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Bgra32> destPixels) internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Bgra32> destPixels)
{ {
@ -237,7 +235,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromBgra32(sp); dp.FromBgra32(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Bgra32> internal class PixelOperations : PixelOperations<Bgra32>
{ {
<# <# GenerateAllDefaultConversionMethods("Bgra32"); #>
GenerateAllDefaultConversionMethods("Bgra32");
#>
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray16.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Gray16> internal class PixelOperations : PixelOperations<Gray16>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromGray16(Configuration configuration, ReadOnlySpan<Gray16> source, Span<Gray16> destPixels) internal override void FromGray16(Configuration configuration, ReadOnlySpan<Gray16> source, Span<Gray16> destPixels)
{ {
@ -186,7 +185,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromGray16(sp); dp.FromGray16(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray16.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Gray16> internal class PixelOperations : PixelOperations<Gray16>
{ {
<# <# GenerateAllDefaultConversionMethods("Gray16"); #>
GenerateAllDefaultConversionMethods("Gray16");
#>
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray8.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Gray8> internal class PixelOperations : PixelOperations<Gray8>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromGray8(Configuration configuration, ReadOnlySpan<Gray8> source, Span<Gray8> destPixels) internal override void FromGray8(Configuration configuration, ReadOnlySpan<Gray8> source, Span<Gray8> destPixels)
{ {
@ -186,7 +185,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromGray8(sp); dp.FromGray8(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Gray8.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Gray8> internal class PixelOperations : PixelOperations<Gray8>
{ {
<# <# GenerateAllDefaultConversionMethods("Gray8"); #>
GenerateAllDefaultConversionMethods("Gray8");
#>
} }
} }
} }

3
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Rgb24> internal class PixelOperations : PixelOperations<Rgb24>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromRgb24(Configuration configuration, ReadOnlySpan<Rgb24> source, Span<Rgb24> destPixels) internal override void FromRgb24(Configuration configuration, ReadOnlySpan<Rgb24> source, Span<Rgb24> destPixels)
{ {
@ -42,7 +41,6 @@ namespace SixLabors.ImageSharp.PixelFormats
sourcePixels.CopyTo(destPixels); sourcePixels.CopyTo(destPixels);
} }
/// <inheritdoc /> /// <inheritdoc />
internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Rgb24> destPixels) internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<Rgb24> destPixels)
{ {
@ -211,7 +209,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromRgb24(sp); dp.FromRgb24(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Rgb24> internal class PixelOperations : PixelOperations<Rgb24>
{ {
<# <# GenerateAllDefaultConversionMethods("Rgb24"); #>
GenerateAllDefaultConversionMethods("Rgb24");
#>
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Rgb48> internal class PixelOperations : PixelOperations<Rgb48>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromRgb48(Configuration configuration, ReadOnlySpan<Rgb48> source, Span<Rgb48> destPixels) internal override void FromRgb48(Configuration configuration, ReadOnlySpan<Rgb48> source, Span<Rgb48> destPixels)
{ {
@ -186,7 +185,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromRgb48(sp); dp.FromRgb48(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Rgb48> internal class PixelOperations : PixelOperations<Rgb48>
{ {
<# <# GenerateAllDefaultConversionMethods("Rgb48"); #>
GenerateAllDefaultConversionMethods("Rgb48");
#>
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal partial class PixelOperations : PixelOperations<Rgba32> internal partial class PixelOperations : PixelOperations<Rgba32>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromRgba32(Configuration configuration, ReadOnlySpan<Rgba32> source, Span<Rgba32> destPixels) internal override void FromRgba32(Configuration configuration, ReadOnlySpan<Rgba32> source, Span<Rgba32> destPixels)
{ {
@ -212,7 +211,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromRgba32(sp); dp.FromRgba32(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal partial class PixelOperations : PixelOperations<Rgba32> internal partial class PixelOperations : PixelOperations<Rgba32>
{ {
<# <# GenerateAllDefaultConversionMethods("Rgba32"); #>
GenerateAllDefaultConversionMethods("Rgba32");
#>
} }
} }
} }

2
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.cs
View File

@ -23,7 +23,6 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Rgba64> internal class PixelOperations : PixelOperations<Rgba64>
{ {
/// <inheritdoc /> /// <inheritdoc />
internal override void FromRgba64(Configuration configuration, ReadOnlySpan<Rgba64> source, Span<Rgba64> destPixels) internal override void FromRgba64(Configuration configuration, ReadOnlySpan<Rgba64> source, Span<Rgba64> destPixels)
{ {
@ -186,7 +185,6 @@ namespace SixLabors.ImageSharp.PixelFormats
dp.FromRgba64(sp); dp.FromRgba64(sp);
} }
} }
} }
} }
} }

5
src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.tt
View File

@ -13,10 +13,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// </summary> /// </summary>
internal class PixelOperations : PixelOperations<Rgba64> internal class PixelOperations : PixelOperations<Rgba64>
{ {
<# <# GenerateAllDefaultConversionMethods("Rgba64"); #>
GenerateAllDefaultConversionMethods("Rgba64");
#>
} }
} }
} }

20
src/ImageSharp/PixelFormats/PixelImplementations/Generated/_Common.ttinclude
View File

@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
void GenerateDefaultSelfConversionMethods(string pixelType) void GenerateDefaultSelfConversionMethods(string pixelType)
{ {
#> #>
/// <inheritdoc />
/// <inheritdoc />
internal override void From<#=pixelType#>(Configuration configuration, ReadOnlySpan<<#=pixelType#>> source, Span<<#=pixelType#>> destPixels) internal override void From<#=pixelType#>(Configuration configuration, ReadOnlySpan<<#=pixelType#>> source, Span<<#=pixelType#>> destPixels)
{ {
Guard.NotNull(configuration, nameof(configuration)); Guard.NotNull(configuration, nameof(configuration));
@ -44,12 +43,12 @@ using System.Runtime.InteropServices;
sourcePixels.CopyTo(destPixels); sourcePixels.CopyTo(destPixels);
} }
<#+ <#+
} }
void GenerateDefaultConvertToMethod(string fromPixelType, string toPixelType) void GenerateDefaultConvertToMethod(string fromPixelType, string toPixelType)
{ {
#> #>
/// <inheritdoc /> /// <inheritdoc />
internal override void To<#=toPixelType#>(Configuration configuration, ReadOnlySpan<<#=fromPixelType#>> sourcePixels, Span<<#=toPixelType#>> destPixels) internal override void To<#=toPixelType#>(Configuration configuration, ReadOnlySpan<<#=fromPixelType#>> sourcePixels, Span<<#=toPixelType#>> destPixels)
@ -68,12 +67,12 @@ using System.Runtime.InteropServices;
dp.From<#=fromPixelType#>(sp); dp.From<#=fromPixelType#>(sp);
} }
} }
<#+ <#+
} }
void GenerateOptimized32BitConversionMethods(string thisPixelType, string otherPixelType) void GenerateOptimized32BitConversionMethods(string thisPixelType, string otherPixelType)
{ {
#> #>
/// <inheritdoc /> /// <inheritdoc />
internal override void To<#=otherPixelType#>(Configuration configuration, ReadOnlySpan<<#=thisPixelType#>> sourcePixels, Span<<#=otherPixelType#>> destPixels) internal override void To<#=otherPixelType#>(Configuration configuration, ReadOnlySpan<<#=thisPixelType#>> sourcePixels, Span<<#=otherPixelType#>> destPixels)
{ {
@ -105,13 +104,12 @@ using System.Runtime.InteropServices;
Unsafe.Add(ref destRef, i) = PixelConverter.From<#=otherPixelType#>.To<#=thisPixelType#>(sp); Unsafe.Add(ref destRef, i) = PixelConverter.From<#=otherPixelType#>.To<#=thisPixelType#>(sp);
} }
} }
<#+ <#+
} }
void GenerateRgba32CompatibleVector4ConversionMethods(string pixelType) void GenerateRgba32CompatibleVector4ConversionMethods(string pixelType)
{ {
#> #>
/// <inheritdoc /> /// <inheritdoc />
internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels) internal override void FromVector4(Configuration configuration, ReadOnlySpan<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels)
{ {
@ -136,7 +134,7 @@ using System.Runtime.InteropServices;
Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true); Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);
} }
<#+ <#+
} }
void GenerateAllDefaultConversionMethods(string pixelType) void GenerateAllDefaultConversionMethods(string pixelType)

Write Preview
Loading…
Cancel
Save