From 920120864f315f4faa4dab7c19481b839a6d30a7 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 5 Aug 2019 15:54:13 +0200 Subject: [PATCH] Fix initialization of COLOR4D statics Just declaring as static const would give an initialization order fiasco since they were being used to initialize other statics. --- common/gal/color4d.cpp | 6 +++--- include/gal/color4d.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/gal/color4d.cpp b/common/gal/color4d.cpp index bc71f45bcb..eadc3c2206 100644 --- a/common/gal/color4d.cpp +++ b/common/gal/color4d.cpp @@ -362,6 +362,6 @@ COLOR4D& COLOR4D::Saturate( double aFactor ) return *this; } -const COLOR4D COLOR4D::UNSPECIFIED( 0, 0, 0, 0 ); -const COLOR4D COLOR4D::WHITE( 1, 1, 1, 1 ); -const COLOR4D COLOR4D::BLACK( 0, 0, 0, 1 ); +constexpr COLOR4D COLOR4D::UNSPECIFIED( 0, 0, 0, 0 ); +constexpr COLOR4D COLOR4D::WHITE( 1, 1, 1, 1 ); +constexpr COLOR4D COLOR4D::BLACK( 0, 0, 0, 1 ); diff --git a/include/gal/color4d.h b/include/gal/color4d.h index 1b3932623d..acd48205e7 100644 --- a/include/gal/color4d.h +++ b/include/gal/color4d.h @@ -2,7 +2,7 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2012 Torsten Hueter, torstenhtr gmx.de - * Copyright (C) 2017 Kicad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2017-2019 Kicad Developers, see AUTHORS.txt for contributors. * * Color class * @@ -53,7 +53,7 @@ public: * @param aBlue is the blue component [0.0 .. 1.0]. * @param aAlpha is the alpha value [0.0 .. 1.0]. */ - COLOR4D( double aRed, double aGreen, double aBlue, double aAlpha ) : + constexpr COLOR4D( double aRed, double aGreen, double aBlue, double aAlpha ) : r( aRed ), g( aGreen ), b( aBlue ), a( aAlpha ) { assert( r >= 0.0 && r <= 1.0 );