From: dirk <dirk@git.imagemagick.org>
Date: Tue, 4 Nov 2014 21:52:01 +0000 (+0000)
Subject: Added CMYKA constructor to the Color class.
X-Git-Tag: 7.0.1-0~1786
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6485563b5a957c2e8c4ef9f85d35abc0f795e043;p=imagemagick

Added CMYKA constructor to the Color class.
---

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 961f9747b..3f1085fe5 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -95,7 +95,7 @@ Magick::Color::Color(const Quantum red_,const Quantum green_,
   : _pixel(new PixelInfo),
     _isValid(true),
     _pixelOwn(true),
-    _pixelType(RGBAPixel)
+    _pixelType(RGBPixel)
 {
   initPixel();
 
@@ -104,6 +104,26 @@ Magick::Color::Color(const Quantum red_,const Quantum green_,
   quantumBlue(blue_);
   quantumGreen(green_);
   quantumRed(red_);
+  if (alpha_ != OpaqueAlpha)
+    _pixelType=RGBAPixel;
+}
+
+Magick::Color::Color(const Quantum cyan_,const Quantum magenta_,
+  const Quantum yellow_,const Quantum black_,const Quantum alpha_)
+  : _pixel(new PixelInfo),
+    _isValid(true),
+    _pixelOwn(true),
+    _pixelType(CMYKPixel)
+{
+  initPixel();
+
+  quantumAlpha(alpha_);
+  quantumBlack(black_);
+  quantumBlue(yellow_);
+  quantumGreen(magenta_);
+  quantumRed(cyan_);
+  if (alpha_ != OpaqueAlpha)
+    _pixelType=CMYKAPixel;
 }
 
 Magick::Color::Color(const char *color_)
diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index 619e4b43d..6182ea774 100644
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -44,6 +44,10 @@ namespace Magick
     Color(const Quantum red_,const Quantum green_,const Quantum blue_,
       const Quantum alpha_);
 
+    // Construct Color using the specified CMYKA values
+    Color(const Quantum cyan_,const Quantum magenta_,const Quantum yellow_,
+      const Quantum black_,const Quantum alpha_);
+
     // Construct Color using the specified color string
     Color(const char *color_);