diff options
| -rw-r--r-- | dmagick/ColorCMYK.d | 175 | ||||
| -rw-r--r-- | dmagick/ColorYUV.d | 10 | ||||
| -rw-r--r-- | dmagick/ImageView.d | 2 |
3 files changed, 184 insertions, 3 deletions
diff --git a/dmagick/ColorCMYK.d b/dmagick/ColorCMYK.d new file mode 100644 index 0000000..783ffb1 --- /dev/null +++ b/dmagick/ColorCMYK.d @@ -0,0 +1,175 @@ +/** + * Copyright: Mike Wey 2011 + * License: zlib (See accompanying LICENSE file) + * Authors: Mike Wey + */ + +module dmagick.ColorCMYK; + +import std.algorithm; + +import dmagick.Color; + +import dmagick.c.magickType; +import dmagick.c.quantum; + +/** + * The CMY(K) color model describes a color space with subtractive color + * composition as it is used for the color printing process, e.g. used by + * ink or laser printers. Each color is described by the color components + * cyan (C), magenta (M) and yellow (Y). The additional component black (K) + * is used for better gray and black reproduction. + * + * Note: This class doesn't use ICC or ICM profiles for the converson of + * CMYK to RGB. + */ +class ColorCMYK : Color +{ + this() + { + super(); + } + + /** + * Create a CMYK Color from the specified doubles. + */ + this(double cyan, double magenta, double yellow, double black) + { + Quantum red, green, blue; + + convertCMYKToRGB(cyan, magenta, yellow, black, red, green, blue); + + super(red, green, blue); + } + + /** + * The value for cyan. + */ + void cyan(double cyan) + { + double oldCyan, magenta, yellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, oldCyan, magenta, yellow, black); + convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue); + } + ///ditto + double cyan() + { + double cyan, magenta, yellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black); + + return cyan; + } + + /** + * The value for magenta. + */ + void magenta(double magenta) + { + double cyan, oldMagenta, yellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, oldMagenta, yellow, black); + convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue); + } + ///ditto + double magenta() + { + double cyan, magenta, yellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black); + + return magenta; + } + + /** + * The value for yellow. + */ + void yellow(double yellow) + { + double cyan, magenta, oldYellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, oldYellow, black); + convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue); + } + ///ditto + double yellow() + { + double cyan, magenta, yellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black); + + return yellow; + } + + /** + * The value for black. + */ + void black(double black) + { + double cyan, magenta, yellow, oldBlack; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, oldBlack); + convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue); + } + ///ditto + double black() + { + double cyan, magenta, yellow, black; + + convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black); + + return black; + } + + /** + * Convert an RGB value to a CMYK value. + */ + private void convertRGBToCMYK(Quantum red, Quantum green, Quantum blue, ref double cyan, ref double magenta, ref double yellow, ref double black) + { + double r = scaleQuantumToDouble(red); + double g = scaleQuantumToDouble(green); + double b = scaleQuantumToDouble(blue); + + black = min(1 - r, 1 - g, 1 - b); + + cyan = (1 - r - black) / (1 - black); + magenta = (1 - g - black) / (1 - black); + yellow = (1 - b - black) / (1 - black); + } + + /** + * Convert an CMYK value to a RGB value. + */ + private void convertCMYKToRGB(double cyan, double magenta, double yellow, double black, ref Quantum red, ref Quantum green, ref Quantum blue) + in + { + assert(cyan <= 1 && cyan >= 0); + assert(magenta <= 1 && magenta >= 0); + assert(yellow <= 1 && yellow >= 0); + assert(black <= 1 && black >= 0); + } + body + { + double r = 1 - min(1, cyan * (1 - black) + black); + double g = 1 - min(1, magenta * (1 - black) + black); + double b = 1 - min(1, yellow * (1 - black) + black); + + red = scaleDoubleToQuantum(r); + green = scaleDoubleToQuantum(g); + blue = scaleDoubleToQuantum(b); + } +} + +unittest +{ + assert(new ColorCMYK(0, 1, 1, 0 ) == new Color("red")); + + auto color1 = new ColorCMYK(0.5, 0.5, 0.5, 0.5); + auto color2 = new Color("gray25"); + + //Compare the colors a bytes, to compensate for rounding errors. + assert(ScaleQuantumToChar(color1.redQuantum) == ScaleQuantumToChar(color2.redQuantum)); + assert(ScaleQuantumToChar(color1.greenQuantum) == ScaleQuantumToChar(color2.greenQuantum)); + assert(ScaleQuantumToChar(color1.blueQuantum) == ScaleQuantumToChar(color2.blueQuantum)); +} diff --git a/dmagick/ColorYUV.d b/dmagick/ColorYUV.d index 16bc63a..19feebf 100644 --- a/dmagick/ColorYUV.d +++ b/dmagick/ColorYUV.d @@ -4,7 +4,7 @@ * Authors: Mike Wey */ -module dmagick.ColorRGB; +module dmagick.ColorYUV; import dmagick.Color; @@ -22,7 +22,7 @@ import dmagick.c.quantum; * The luminance component is sufficient for black-and-white TV sets, * whereas color TV sets need the additional chrominance information. */ -class ColorRGB : Color +class ColorYUV : Color { this() { @@ -130,7 +130,13 @@ class ColorRGB : Color * Convert an YUV value to a RGB value. */ private void convertYUVToRGB(double y, double u, double v, ref Quantum red, ref Quantum green, ref Quantum blue) + in { + assert(y <= 1 && y >= 0); + assert(u <= 1 && u >= 0); + assert(v <= 1 && v >= 0); + } + body { // ⌈R⌉ ⌈ 1.000 0.000 1.140⌉ ⌈Y⌉ // |G|=| 1.000 -0.395 -0.581|·|U| // ⌊B⌋ ⌊ 1.000 2.032 0.000⌋ ⌊V⌋ diff --git a/dmagick/ImageView.d b/dmagick/ImageView.d index 61600b9..fbce73c 100644 --- a/dmagick/ImageView.d +++ b/dmagick/ImageView.d @@ -380,7 +380,7 @@ struct Pixels { Image image = new Image(Geometry(100, 100), new Color("Blue")); { - Row row = Row.row(image, 50, 50, 25); + Pixels row = Pixels(image, 25, 50, 50, 1); row[] = new Color("red"); } |