From 52ae365c66c5ec47be259b22c6ab8ed378eed291 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Thu, 23 Apr 2020 18:18:16 +0100 Subject: [PATCH] fix operator== (ref #4137) --- include/mapnik/color.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/mapnik/color.hpp b/include/mapnik/color.hpp index 660abe15e..ffdc0d325 100644 --- a/include/mapnik/color.hpp +++ b/include/mapnik/color.hpp @@ -103,10 +103,11 @@ public: inline bool operator==(color const& rhs) const { - return (red_== rhs.red()) && - (green_ == rhs.green()) && - (blue_ == rhs.blue()) && - (alpha_ == rhs.alpha()); + return (red_== rhs.red_) && + (green_ == rhs.green_) && + (blue_ == rhs.blue_) && + (alpha_ == rhs.alpha_) && + (premultiplied_ == rhs.premultiplied_); } inline std::uint8_t red() const @@ -151,9 +152,9 @@ public: { return premultiplied_; } - inline void set_premultiplied(bool status) + inline void set_premultiplied(bool val) { - premultiplied_ = status; + premultiplied_ = val; } inline unsigned rgba() const