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

Merge pull request #500 from dlemstra/Color 

Refactored the Color struct.

Former-commit-id: d3187a3d48c5a4f3544aac94a691f1b8ad67b010
Former-commit-id: dae98521e33cb5f7095045211301083bb71b921a
Former-commit-id: f64ad8696c8135e3b350b4dfefcf47b3169344dc
af/merge-core
James Jackson-South 9 years ago
committed by GitHub
parent
40638d4e8a 43c366a6d0
commit
e88cc9f554
2 changed files with 96 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 138
      src/ImageProcessorCore/Colors/Color.cs
  2. 34
      tests/ImageProcessorCore.Tests/Colors/ColorTests.cs

138
src/ImageProcessorCore/Colors/Color.cs
View File

@ -6,6 +6,7 @@
namespace ImageProcessorCore
{
using System;
using System.Globalization;
using System.Numerics;
using System.Runtime.CompilerServices;
@ -46,12 +47,11 @@ namespace ImageProcessorCore
{
get
{
return (byte)this.packedValue;
return (byte)(this.packedValue >> 24);
}
set
{
// AABBGGRR
this.packedValue = (uint)(this.packedValue & -0x100 | value);
this.packedValue = this.packedValue & 0x00FFFFFF | (uint)value << 24;
}
}
@ -63,12 +63,11 @@ namespace ImageProcessorCore
{
get
{
return (byte)(this.packedValue >> 8);
return (byte)(this.packedValue >> 16);
}
set
{
// AABBGGRR
this.packedValue = (uint)(this.packedValue & -0xFF01 | (uint)value << 8);
this.packedValue = this.packedValue & 0xFF00FFFF | (uint)value << 16;
}
}
@ -79,12 +78,11 @@ namespace ImageProcessorCore
{
get
{
return (byte)(this.packedValue >> 16);
return (byte)(this.packedValue >> 8);
}
set
{
// AABBGGRR
this.packedValue = (uint)(this.packedValue & -0xFF0001 | (uint)(value << 16));
this.packedValue = this.packedValue & 0xFFFF00FF | (uint)value << 8;
}
}
@ -95,12 +93,11 @@ namespace ImageProcessorCore
{
get
{
return (byte)(this.packedValue >> 24);
return (byte)this.packedValue;
}
set
{
// AABBGGRR
this.packedValue = this.packedValue & 0xFFFFFF | (uint)value << 24;
this.packedValue = this.packedValue & 0xFFFFFF00 | value;
}
}
@ -110,16 +107,15 @@ namespace ImageProcessorCore
public uint PackedValue { get { return this.packedValue; } set { this.packedValue = value; } }
/// <summary>
/// Initializes a new instance of the <see cref="Color"/> struct.
/// Initializes a new instance of the <see cref="Color"/> struct.
/// </summary>
/// <param name="r">The red component.</param>
/// <param name="g">The green component.</param>
/// <param name="b">The blue component.</param>
/// <param name="a">The alpha component.</param>
public Color(byte r, byte g, byte b, byte a = 255)
: this()
{
this.packedValue = (uint)(r | g << 8 | b << 16 | a << 24);
this.packedValue = (uint)(r << 24 | g << 16 | b << 8 | a);
}
/// <summary>
@ -127,46 +123,17 @@ namespace ImageProcessorCore
/// </summary>
/// <param name="hex">
/// The hexadecimal representation of the combined color components arranged
/// in rgb, rrggbb, or aarrggbb format to match web syntax.
/// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
/// </param>
public Color(string hex)
: this()
{
// Hexadecimal representations are layed out AARRGGBB to we need to do some reordering.
hex = hex.StartsWith("#") ? hex.Substring(1) : hex;
Guard.NotNullOrEmpty(hex, nameof(hex));
if (hex.Length != 8 && hex.Length != 6 && hex.Length != 3)
{
throw new ArgumentException("Hexadecimal string is not in the correct format.", nameof(hex));
}
hex = ToRgbaHex(hex);
if (hex.Length == 8)
{
this.packedValue =
(uint)(Convert.ToByte(hex.Substring(2, 2), 16)
| Convert.ToByte(hex.Substring(4, 2), 16) << 8
| Convert.ToByte(hex.Substring(6, 2), 16) << 16
| Convert.ToByte(hex.Substring(0, 2), 16) << 24);
}
else if (hex.Length == 6)
if (hex == null || !uint.TryParse(hex, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out this.packedValue))
{
this.packedValue =
(uint)(Convert.ToByte(hex.Substring(0, 2), 16)
| Convert.ToByte(hex.Substring(2, 2), 16) << 8
| Convert.ToByte(hex.Substring(4, 2), 16) << 16
| 255 << 24);
}
else
{
string rh = char.ToString(hex[0]);
string gh = char.ToString(hex[1]);
string bh = char.ToString(hex[2]);
this.packedValue =
(uint)(Convert.ToByte(rh + rh, 16)
| Convert.ToByte(gh + gh, 16) << 8
| Convert.ToByte(bh + bh, 16) << 16
| 255 << 24);
throw new ArgumentException("Hexadecimal string is not in the correct format.", nameof(hex));
}
}
@ -178,7 +145,6 @@ namespace ImageProcessorCore
/// <param name="b">The blue component.</param>
/// <param name="a">The alpha component.</param>
public Color(float r, float g, float b, float a = 1)
: this()
{
this.packedValue = Pack(r, g, b, a);
}
@ -190,7 +156,6 @@ namespace ImageProcessorCore
/// The vector containing the components for the packed vector.
/// </param>
public Color(Vector3 vector)
: this()
{
this.packedValue = Pack(ref vector);
}
@ -202,7 +167,6 @@ namespace ImageProcessorCore
/// The vector containing the components for the packed vector.
/// </param>
public Color(Vector4 vector)
: this()
{
this.packedValue = Pack(ref vector);
}
@ -217,7 +181,7 @@ namespace ImageProcessorCore
/// The <see cref="Color"/> on the right side of the operand.
/// </param>
/// <returns>
/// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
/// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
/// </returns>
public static bool operator ==(Color left, Color right)
{
@ -230,13 +194,34 @@ namespace ImageProcessorCore
/// <param name="left">The <see cref="Color"/> on the left side of the operand.</param>
/// <param name="right">The <see cref="Color"/> on the right side of the operand.</param>
/// <returns>
/// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
/// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
/// </returns>
public static bool operator !=(Color left, Color right)
{
return left.packedValue != right.packedValue;
}
/// <summary>
/// Creates a new instance of the <see cref="Color"/> struct.
/// </summary>
/// <param name="hex">
/// The hexadecimal representation of the combined color components arranged
/// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
/// </param>
public static Color FromHex(string hex)
{
return new Color(hex);
}
/// <summary>
/// Converts the value of this instance to a hexadecimal string.
/// </summary>
/// <returns>A hexadecimal string representation of the value.</returns>
public string ToHex()
{
return this.PackedValue.ToString("X8");
}
/// <inheritdoc/>
public void PackFromVector4(Vector4 vector)
{
@ -273,7 +258,7 @@ namespace ImageProcessorCore
/// <inheritdoc/>
public override int GetHashCode()
{
return this.GetHashCode(this);
return this.packedValue.GetHashCode();
}
/// <summary>
@ -307,25 +292,42 @@ namespace ImageProcessorCore
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint Pack(float x, float y, float z, float w)
{
return (uint)((byte)Math.Round(x.Clamp(Zero, One) * MaxBytes)
| ((byte)Math.Round(y.Clamp(Zero, One) * MaxBytes) << 8)
| (byte)Math.Round(z.Clamp(Zero, One) * MaxBytes) << 16
| (byte)Math.Round(w.Clamp(Zero, One) * MaxBytes) << 24);
return (uint)((byte)Math.Round(x.Clamp(Zero, One) * MaxBytes) << 24
| (byte)Math.Round(y.Clamp(Zero, One) * MaxBytes) << 16
| (byte)Math.Round(z.Clamp(Zero, One) * MaxBytes) << 8
| (byte)Math.Round(w.Clamp(Zero, One) * MaxBytes));
}
/// <summary>
/// Returns the hash code for this instance.
/// Converts the specified hex value to an rrggbbaa hex value.
/// </summary>
/// <param name="packed">
/// The instance of <see cref="Color"/> to return the hash code for.
/// </param>
/// <param name="hex">The hex value to convert.</param>
/// <returns>
/// A 32-bit signed integer that is the hash code for this instance.
/// A rrggbbaa hex value.
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private int GetHashCode(Color packed)
private static string ToRgbaHex(string hex)
{
return packed.packedValue.GetHashCode();
hex = hex.StartsWith("#") ? hex.Substring(1) : hex;
if (hex.Length == 8)
{
return hex;
}
else if (hex.Length == 6)
{
return hex + "FF";
}
else if (hex.Length < 3 || hex.Length > 4)
{
return null;
}
string red = char.ToString(hex[0]);
string green = char.ToString(hex[1]);
string blue = char.ToString(hex[2]);
string alpha = hex.Length == 3 ? "F" : char.ToString(hex[3]);
return red + red + green + green + blue + blue + alpha + alpha;
}
}
}
}

34
tests/ImageProcessorCore.Tests/Colors/ColorTests.cs
View File

@ -24,13 +24,15 @@ namespace ImageProcessorCore.Tests
Color color1 = new Color(0, 0, 0);
Color color2 = new Color(0, 0, 0, 1F);
Color color3 = new Color("#000");
Color color4 = new Color("#000000");
Color color5 = new Color("#FF000000");
Color color4 = new Color("#000F");
Color color5 = new Color("#000000");
Color color6 = new Color("#000000FF");
Assert.Equal(color1, color2);
Assert.Equal(color1, color3);
Assert.Equal(color1, color4);
Assert.Equal(color1, color5);
Assert.Equal(color1, color6);
}
/// <summary>
@ -89,15 +91,31 @@ namespace ImageProcessorCore.Tests
}
/// <summary>
/// Tests to see that in the input hex matches that of the output.
/// Tests whether FromHex and ToHex work correctly.
/// </summary>
[Fact]
public void ConvertHex()
public void FromAndToHex()
{
const string First = "FF000000";
Color color = Color.Black;
string second = color.PackedValue.ToString("X");
Assert.Equal(First, second);
Color color = Color.FromHex("#AABBCCDD");
Assert.Equal(170, color.R);
Assert.Equal(187, color.G);
Assert.Equal(204, color.B);
Assert.Equal(221, color.A);
color.A = 170;
color.B = 187;
color.G = 204;
color.R = 221;
Assert.Equal("DDCCBBAA", color.ToHex());
color.R = 0;
Assert.Equal("00CCBBAA", color.ToHex());
color.A = 255;
Assert.Equal("00CCBBFF", color.ToHex());
}
}
}
Write Preview
Loading…
Cancel
Save