From 33f4ed0a364e414efa8758c7f8d3a59f3c3bf9d8 Mon Sep 17 00:00:00 2001 From: dirk Date: Sat, 23 Nov 2013 21:36:30 +0000 Subject: [PATCH] Restored const char* constructor. Fixed test. --- Magick++/lib/Color.cpp | 9 +++++++++ Magick++/lib/Magick++/Color.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp index 47a7224ca..948d08b72 100644 --- a/Magick++/lib/Color.cpp +++ b/Magick++/lib/Color.cpp @@ -91,6 +91,15 @@ Magick::Color::Color(const Quantum red_,const Quantum green_, quantumAlpha(alpha_); } +Magick::Color::Color(const char *color_) + : _pixel(new PixelInfo),_pixelOwn(true),_isValid(true),_pixelType(RGBPixel) +{ + initPixel(); + + // Use operator = implementation + *this=color_; +} + Magick::Color::Color(const Magick::Color &color_) : _pixel(new PixelInfo),_pixelOwn(true),_isValid(color_._isValid), _pixelType(color_._pixelType) diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h index 664385de4..3a289db71 100644 --- a/Magick++/lib/Magick++/Color.h +++ b/Magick++/lib/Magick++/Color.h @@ -44,6 +44,9 @@ namespace Magick Color(const Quantum red_,const Quantum green_,const Quantum blue_, const Quantum alpha_); + // Construct Color using the specified color string + Color(const char *color_); + // Copy constructor Color(const Color &color_); -- 2.50.1