From dc048bb6ca8e3635015f2e52079491dc769c0c6b Mon Sep 17 00:00:00 2001
From: Arkell Rasiah <arasiah@pixsystem.com>
Date: Thu, 20 Feb 2020 15:53:22 -0800
Subject: [PATCH] ImfChromaticities.cpp: Add back white to equality ops.
This was discussed on openexr-dev and the unanimous conclusion was that white
be added back; NB: no one could quite remember why it was omitted in the first place.
See PR#651.
IMPORTANT: This commit changes the existing behavior of the == and != operators
so schedule its inclusion into the appropriate OpenEXR release.
Signed-off-by: Arkell Rasiah <arasiah@pixsystem.com>
---
OpenEXR/IlmImf/ImfChromaticities.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/OpenEXR/IlmImf/ImfChromaticities.cpp b/OpenEXR/IlmImf/ImfChromaticities.cpp
index f354cdfe5a..712366faa3 100644
--- a/OpenEXR/IlmImf/ImfChromaticities.cpp
+++ b/OpenEXR/IlmImf/ImfChromaticities.cpp
@@ -64,14 +64,14 @@ Chromaticities::Chromaticities (const IMATH_NAMESPACE::V2f &red,
bool
Chromaticities::operator == (const Chromaticities & c) const
{
- return red == c.red && green == c.green && blue == c.blue;
+ return red == c.red && green == c.green && blue == c.blue && white == c.white;
}
bool
Chromaticities::operator != (const Chromaticities & c) const
{
- return red != c.red || green != c.green || blue != c.blue;
+ return red != c.red || green != c.green || blue != c.blue || white != c.white;
}