Browse Source

Use FormattableString

af/merge-core
James Jackson-South 8 years ago
parent
commit
3cd3d0e25f
  1. 2
      src/ImageSharp/PixelFormats/Bgr565.cs
  2. 2
      src/ImageSharp/PixelFormats/Bgra4444.cs
  3. 2
      src/ImageSharp/PixelFormats/Bgra5551.cs
  4. 2
      src/ImageSharp/PixelFormats/Byte4.cs
  5. 3
      src/ImageSharp/PixelFormats/HalfSingle.cs
  6. 3
      src/ImageSharp/PixelFormats/HalfVector2.cs
  7. 3
      src/ImageSharp/PixelFormats/HalfVector4.cs
  8. 2
      src/ImageSharp/PixelFormats/NormalizedByte2.cs
  9. 2
      src/ImageSharp/PixelFormats/NormalizedByte4.cs
  10. 2
      src/ImageSharp/PixelFormats/NormalizedShort2.cs
  11. 2
      src/ImageSharp/PixelFormats/NormalizedShort4.cs
  12. 2
      src/ImageSharp/PixelFormats/Rg32.cs
  13. 6
      src/ImageSharp/PixelFormats/Rgba1010102.cs
  14. 3
      src/ImageSharp/PixelFormats/RgbaVector.cs
  15. 2
      src/ImageSharp/PixelFormats/Short2.cs
  16. 2
      src/ImageSharp/PixelFormats/Short4.cs

2
src/ImageSharp/PixelFormats/Bgr565.cs

@ -148,7 +148,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector3(); var vector = this.ToVector3();
return $"Bgr565({vector.Z:#0.##}, {vector.Y:#0.##}, {vector.X:#0.##})"; return FormattableString.Invariant($"Bgr565({vector.Z:#0.##}, {vector.Y:#0.##}, {vector.X:#0.##})");
} }
/// <inheritdoc /> /// <inheritdoc />

2
src/ImageSharp/PixelFormats/Bgra4444.cs

@ -137,7 +137,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"Bgra4444({vector.Z:#0.##}, {vector.Y:#0.##}, {vector.X:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"Bgra4444({vector.Z:#0.##}, {vector.Y:#0.##}, {vector.X:#0.##}, {vector.W:#0.##})");
} }
/// <inheritdoc /> /// <inheritdoc />

2
src/ImageSharp/PixelFormats/Bgra5551.cs

@ -138,7 +138,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"Bgra5551({vector.Z:#0.##}, {vector.Y:#0.##}, {vector.X:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"Bgra5551({vector.Z:#0.##}, {vector.Y:#0.##}, {vector.X:#0.##}, {vector.W:#0.##})");
} }
/// <inheritdoc /> /// <inheritdoc />

2
src/ImageSharp/PixelFormats/Byte4.cs

@ -142,7 +142,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"Bgra5551({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"Bgra5551({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})");
} }
/// <summary> /// <summary>

3
src/ImageSharp/PixelFormats/HalfSingle.cs

@ -1,6 +1,7 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System;
using System.Numerics; using System.Numerics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@ -130,7 +131,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public bool Equals(HalfSingle other) => this.PackedValue.Equals(other.PackedValue); public bool Equals(HalfSingle other) => this.PackedValue.Equals(other.PackedValue);
/// <inheritdoc /> /// <inheritdoc />
public override string ToString() => $"HalfSingle({this.ToSingle():#0.##})"; public override string ToString() => FormattableString.Invariant($"HalfSingle({this.ToSingle():#0.##})");
/// <inheritdoc /> /// <inheritdoc />
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

3
src/ImageSharp/PixelFormats/HalfVector2.cs

@ -1,6 +1,7 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System;
using System.Numerics; using System.Numerics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@ -150,7 +151,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector2(); var vector = this.ToVector2();
return $"HalfVector2({vector.X:#0.##}, {vector.Y:#0.##})"; return FormattableString.Invariant($"HalfVector2({vector.X:#0.##}, {vector.Y:#0.##})");
} }
/// <inheritdoc /> /// <inheritdoc />

3
src/ImageSharp/PixelFormats/HalfVector4.cs

@ -1,6 +1,7 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System;
using System.Numerics; using System.Numerics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@ -145,7 +146,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"HalfVector4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"HalfVector4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})");
} }
/// <inheritdoc /> /// <inheritdoc />

2
src/ImageSharp/PixelFormats/NormalizedByte2.cs

@ -161,7 +161,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector2(); var vector = this.ToVector2();
return $"NormalizedByte2({vector.X:#0.##}, {vector.Y:#0.##})"; return FormattableString.Invariant($"NormalizedByte2({vector.X:#0.##}, {vector.Y:#0.##})");
} }
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

2
src/ImageSharp/PixelFormats/NormalizedByte4.cs

@ -153,7 +153,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"NormalizedByte4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"NormalizedByte4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})");
} }
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

2
src/ImageSharp/PixelFormats/NormalizedShort2.cs

@ -163,7 +163,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector2(); var vector = this.ToVector2();
return $"NormalizedShort2({vector.X:#0.##}, {vector.Y:#0.##})"; return FormattableString.Invariant($"NormalizedShort2({vector.X:#0.##}, {vector.Y:#0.##})");
} }
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

2
src/ImageSharp/PixelFormats/NormalizedShort4.cs

@ -155,7 +155,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"NormalizedShort4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"NormalizedShort4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})");
} }
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

2
src/ImageSharp/PixelFormats/Rg32.cs

@ -140,7 +140,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector2(); var vector = this.ToVector2();
return $"Rg32({vector.X:#0.##}, {vector.Y:#0.##})"; return FormattableString.Invariant($"Rg32({vector.X:#0.##}, {vector.Y:#0.##})");
} }
/// <inheritdoc /> /// <inheritdoc />

6
src/ImageSharp/PixelFormats/Rgba1010102.cs

@ -135,7 +135,11 @@ namespace SixLabors.ImageSharp.PixelFormats
public bool Equals(Rgba1010102 other) => this.PackedValue == other.PackedValue; public bool Equals(Rgba1010102 other) => this.PackedValue == other.PackedValue;
/// <inheritdoc /> /// <inheritdoc />
public override string ToString() => this.ToVector4().ToString(); public override string ToString()
{
var vector = this.ToVector4();
return FormattableString.Invariant($"Rgba1010102({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})");
}
/// <inheritdoc /> /// <inheritdoc />
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

3
src/ImageSharp/PixelFormats/RgbaVector.cs

@ -1,6 +1,7 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System;
using System.Numerics; using System.Numerics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -189,7 +190,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"RgbaVector({this.R:#0.##}, {this.G:#0.##}, {this.B:#0.##}, {this.A:#0.##})"; return FormattableString.Invariant($"RgbaVector({this.R:#0.##}, {this.G:#0.##}, {this.B:#0.##}, {this.A:#0.##})");
} }
/// <inheritdoc/> /// <inheritdoc/>

2
src/ImageSharp/PixelFormats/Short2.cs

@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector2(); var vector = this.ToVector2();
return $"Short2({vector.X:#0.##}, {vector.Y:#0.##})"; return FormattableString.Invariant($"Short2({vector.X:#0.##}, {vector.Y:#0.##})");
} }
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

2
src/ImageSharp/PixelFormats/Short4.cs

@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.PixelFormats
public override string ToString() public override string ToString()
{ {
var vector = this.ToVector4(); var vector = this.ToVector4();
return $"Short4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})"; return FormattableString.Invariant($"Short4({vector.X:#0.##}, {vector.Y:#0.##}, {vector.Z:#0.##}, {vector.W:#0.##})");
} }
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]

Loading…
Cancel
Save