Fix build on old GCC.

[libdcp.git] / src / chromaticity.h

diff --git a/src/chromaticity.h b/src/chromaticity.h
index 7bb74483bd53f1d4419291b830619c5d2ae0646d..41bb8fdac52ce93c1e68d5a9a14b6a5b6ec8ab87 100644 (file)
--- a/src/chromaticity.h
+++ b/src/chromaticity.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,37 +15,53 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+
 /** @file  src/chromaticity.h
- *  @brief Chromaticity class.
+ *  @brief Chromaticity class
  */
 
+
 #ifndef DCP_CHROMATICITY_H
 #define DCP_CHROMATICITY_H
 
+
 #include <cmath>
 
+
 namespace dcp {
 
+
 /** @class Chromaticity
  *  @brief A representation of a x,y,z chromaticity, where z = 1 - x - y
  */
 class Chromaticity
 {
 public:
-       Chromaticity ()
-               : x (0)
-               , y (0)
-       {}
+       Chromaticity () {}
 
        Chromaticity (double x_, double y_)
                : x (x_)
                , y (y_)
        {}
 
-       double x;
-       double y;
+       double x = 0;
+       double y = 0;
 
        double z () const {
                return 1 - x - y;
@@ -53,10 +69,14 @@ public:
 
        /** @return true if this Chromaticity's x and y are within epsilon of other */
        bool about_equal (Chromaticity const & other, float epsilon) const {
-               return std::fabs (x - other.x) < epsilon && std::fabs (y - other.y) < epsilon;
+               return std::fabs(x - other.x) < epsilon && std::fabs(y - other.y) < epsilon;
        }
+
+       static Chromaticity D65 ();
 };
 
+
 }
 
+
 #endif