Skip to content

Commit a419d07

Browse files
committed
Corrected the ToShortString method of MagickColor for CMYK.
1 parent 878e52d commit a419d07

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/Magick.NET/Colors/MagickColor.cs

+9-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,15 @@ public string ToShortString()
461461
return ToString();
462462

463463
if (IsCmyk)
464-
return string.Format(CultureInfo.InvariantCulture, "cmyk({0},{1},{2},{3})", R, G, B, K);
464+
{
465+
var r = Quantum.ScaleToByte(R);
466+
var g = Quantum.ScaleToByte(G);
467+
var b = Quantum.ScaleToByte(B);
468+
var k = Quantum.ScaleToByte(K);
469+
470+
return string.Format(CultureInfo.InvariantCulture, "cmyk({0},{1},{2},{3})", r, g, b, k);
471+
}
472+
465473
#if Q8
466474
return string.Format(CultureInfo.InvariantCulture, "#{0:X2}{1:X2}{2:X2}", R, G, B);
467475
#elif Q16 || Q16HDRI

tests/Magick.NET.Tests/Colors/MagickColorTests/TheToShortStringMethod.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void ShouldIncludeTheAlphaChannelWhenNotFullyOpquery()
4040
public void ShouldReturnTheCorrectStringForCmykColor()
4141
{
4242
var color = new MagickColor(0, Quantum.Max, 0, 0, Quantum.Max);
43-
Assert.Equal("cmyk(0," + Quantum.Max + ",0,0)", color.ToShortString());
43+
Assert.Equal("cmyk(0,255,0,0)", color.ToShortString());
4444
}
4545
}
4646
}

0 commit comments

Comments
 (0)